[Checkins] SVN: zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py Fixed various typos after trying on windows.

Jim Fulton jim at zope.com
Wed Sep 13 18:28:57 EDT 2006


Log message for revision 70163:
  Fixed various typos after trying on windows.
  

Changed:
  U   zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py

-=-
Modified: zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py
===================================================================
--- zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py	2006-09-13 21:48:26 UTC (rev 70162)
+++ zc.buildoutsftp/branches/dev/src/zc/buildoutsftp/urllib2sftp.py	2006-09-13 22:28:56 UTC (rev 70163)
@@ -27,8 +27,8 @@
     import _winreg
     parse_reg_key_name = re.compile('(rsa|dss)2?@22:(\S+)$').match
     def _get_hosts_keys():
-        regkey = _winreg.OpenKey(_winreg.HKEY_CURENT_USER,
-                                 r'Software\SimonTatham\PuTTY\SshHoskKeys',
+        regkey = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER,
+                                 r'Software\SimonTatham\PuTTY\SshHostKeys',
                                  )
         keys = paramiko.HostKeys()
         i = 0
@@ -37,15 +37,17 @@
                 name, value, type_ = _winreg.EnumValue(regkey, i)
                 i += 1
                 value = [long(v, 16) for v in value.split(',')]
+                ktype, host = parse_reg_key_name(name).groups()
                 if ktype == 'rsa':
                     key = paramiko.RSAKey(vals=value)
                 if ktype == 'dss':
                     key = paramiko.DSSKey(vals=value)
-                ktype, host = parse_reg_key_name(name).groups()
                 keys.add(host, 'ssh-'+ktype, key)
             except WindowsError:
                 break
 
+        return keys
+
 else:
 
     def _get_hosts_keys():



More information about the Checkins mailing list