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

sync: if ssl module is not present, do not offer fingerprint query

Changeset cd7d35c1435b

Parent c32aa44bcf96

by Steve Borho

Changes to one file · Browse files at cd7d35c1435b Showing diff from parent c32aa44bcf96 Diff from another changeset...

 
10
11
12
13
14
15
16
 
1024
1025
1026
1027
1028
1029
1030
 
 
 
 
 
 
 
1031
1032
1033
 
10
11
12
 
13
14
15
 
1023
1024
1025
 
 
 
 
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
@@ -10,7 +10,6 @@
 import re  import tempfile  import urlparse -import ssl    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -1024,10 +1023,13 @@
  if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7   le.setPlaceholderText('### host certificate fingerprint ###')   hbox.addWidget(le) - qb = QPushButton(_('Query')) - qb.clicked.connect(genfingerprint) - hbox.addWidget(qb) - + try: + import ssl # Python 2.6 or backport for 2.5 + qb = QPushButton(_('Query')) + qb.clicked.connect(genfingerprint) + hbox.addWidget(qb) + except ImportError: + pass     BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Help|BB.Save|BB.Cancel)