Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable thread: if ssl module is not present, do not manage SSLError

Changeset 4614322e706d…

Parent a2c849772b04…

by André Sintzoff

Changes to one file · Browse files at 4614322e706d Showing diff from parent a2c849772b04 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thread.py Stacked
 
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
 
 
 
 
 
 
 
 
 
 
 
 
 
 
300
301
302
 
285
286
287
 
288
 
 
 
 
 
 
 
 
 
 
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
@@ -285,18 +285,21 @@
  err = local._('HTTP Error: %d (%s)') % (e.code, e.msg)   ui.write_err(err + '\n')   except urllib2.URLError, e: - import ssl   err = local._('URLError: %s') % str(e.reason) - if isinstance(e.args[0], ssl.SSLError): - parts = e.args[0].strerror.split(':') - if len(parts) == 7: - file, line, level, _errno, lib, func, reason = parts - if func == 'SSL3_GET_SERVER_CERTIFICATE': - err = local._('SSL: Server certificate verify failed') - elif _errno == '00000000': - err = local._('SSL: unknown error %s:%s') % (file, line) - else: - err = local._('SSL error: %s') % reason + try: + import ssl # Python 2.6 or backport for 2.5 + if isinstance(e.args[0], ssl.SSLError): + parts = e.args[0].strerror.split(':') + if len(parts) == 7: + file, line, level, _errno, lib, func, reason = parts + if func == 'SSL3_GET_SERVER_CERTIFICATE': + err = local._('SSL: Server certificate verify failed') + elif _errno == '00000000': + err = local._('SSL: unknown error %s:%s') % (file, line) + else: + err = local._('SSL error: %s') % reason + except ImportError: + pass   ui.write_err(err + '\n')   except error.AmbiguousCommand, inst:   ui.warn(local._("hg: command '%s' is ambiguous:\n %s\n") %