[windmill/windmill] 5990be: Fix a mistaken ImportError catch when it should be...

1 view

Skip to first unread message

nor...@github.com

unread,

Nov 17, 2010, 3:13:56 PM11/17/10

to windmill...@googlegroups.com

Branch: refs/heads/master
Home: https://github.com/windmill/windmill

Commit: 5990bec4a52a090aebf3e936e0590e3dd8615639
https://github.com/windmill/windmill/commit/5990bec4a52a090aebf3e936e0590e3dd8615639
Author: Dan Hipschman <d...@linux.ucla.edu>
Date: 2010-11-17 (Wed, 17 Nov 2010)

Changed paths:
M windmill/server/https.py

Log Message:
-----------
Fix a mistaken ImportError catch when it should be AttributeError.

I've left the ImportError there as well in case it was triggered by
some version other than 2.5, but 2.5 has an ssl module, the socket
module just doesn't have a create_connection function which was added
in 2.6. Fixes this crash:

$ windmill shell firefox http://www.google.com
Traceback (most recent call last):
File "/home/dsh/pyenv/2.5/bin/windmill", line 8, in <module>
load_entry_point('windmill==1.5pre', 'console_scripts', 'windmill')()
File "/home/dsh/src/windmill/windmill/bin/windmill_bin.py", line 33, in main
admin_lib.command_line_startup()
File "/home/dsh/src/windmill/windmill/bin/admin_lib.py", line 348, in command_line_startup
shell_objects = setup()
File "/home/dsh/src/windmill/windmill/bin/admin_lib.py", line 153, in setup
httpd, httpd_thread = run_threaded(windmill.settings['CONSOLE_LOG_LEVEL'])
File "/home/dsh/src/windmill/windmill/bin/admin_lib.py", line 95, in run_threaded
httpd = setup_servers(console_level)
File "/home/dsh/src/windmill/windmill/bin/admin_lib.py", line 89, in setup_servers
httpd = windmill.server.wsgi.make_windmill_server()
File "/home/dsh/src/windmill/windmill/server/wsgi.py", line 200, in make_windmill_server
import https
File "/home/dsh/src/windmill/windmill/server/https.py", line 49, in <module>
_socket_create_connection = socket.create_connection

Commit: 3e0e3814c3804dd330e336cb09258155d64dd907
https://github.com/windmill/windmill/commit/3e0e3814c3804dd330e336cb09258155d64dd907
Author: Dan Hipschman <d...@linux.ucla.edu>
Date: 2010-11-17 (Wed, 17 Nov 2010)