[Checkins] SVN: zope.app.fssync/branches/jim-hack/src/zope/app/fssync/ Minor cleanups.

[Amos Latteier]

Log message for revision 96855:
  Minor cleanups.
  

Changed:
  U   zope.app.fssync/branches/jim-hack/src/zope/app/fssync/demo_server.py
  U   zope.app.fssync/branches/jim-hack/src/zope/app/fssync/merge.py
  U   zope.app.fssync/branches/jim-hack/src/zope/app/fssync/ssh.py

-=-
Modified: zope.app.fssync/branches/jim-hack/src/zope/app/fssync/demo_server.py
===================================================================
--- zope.app.fssync/branches/jim-hack/src/zope/app/fssync/demo_server.py	2009-02-20 20:52:45 UTC (rev 96854)
+++ zope.app.fssync/branches/jim-hack/src/zope/app/fssync/demo_server.py	2009-02-20 21:20:08 UTC (rev 96855)
@@ -32,8 +32,8 @@
 
     def check_auth_publickey(self, username, key):
         # All public keys are accepted for the demo, in a real server
-        # you would check public keys against keys of authorized
-        # users.
+        # you would probably check public keys against keys of
+        # authorized users.
         return paramiko.AUTH_SUCCESSFUL
 
     def get_allowed_auths(self, username):
@@ -63,7 +63,7 @@
         if length:
             body = f.read(length)
         return command, path, headers, body
-            
+
     def start_subsystem(self, name, transport, channel):
         command, path, headers, body = self.parse_request(channel, transport)
         connection = httplib.HTTPConnection('localhost', 8080)
@@ -76,11 +76,11 @@
                 response.status, response.reason))
         for name, value in response.getheaders():
             channel.send('%s: %s\r\n' % (name, value))
-        channel.send('\r\n')    
+        channel.send('\r\n')
         body = response.read()
-        channel.send(body)
-        
-            
+        channel.sendall(body)
+
+
 def main(port=2200):
     # read host keys
     host_key = paramiko.RSAKey(filename = '/etc/ssh/ssh_host_rsa_key')

Modified: zope.app.fssync/branches/jim-hack/src/zope/app/fssync/merge.py
===================================================================
--- zope.app.fssync/branches/jim-hack/src/zope/app/fssync/merge.py	2009-02-20 20:52:45 UTC (rev 96854)
+++ zope.app.fssync/branches/jim-hack/src/zope/app/fssync/merge.py	2009-02-20 21:20:08 UTC (rev 96855)
@@ -38,7 +38,7 @@
             for name in self.sync.metadata.getnames(src):
                 copier.copy(os.path.join(src, name), os.path.join(dst, name))
             self.sync.metadata.flush()
-    
+
     def _syncadd(self, target, type, factory):
         pass
 
@@ -75,7 +75,7 @@
         if not same_file(f1, f2):
             return False
     return True
-        
+
 def same_specials(path1, path2, metadata):
     extra1 = zope.fssync.fsutil.getextra(path1)
     extra2 = zope.fssync.fsutil.getextra(path2)
@@ -108,7 +108,7 @@
     metadata = sync.metadata
     object_copier = zope.fssync.copier.ObjectCopier(sync)
     merge_copier = MergeCopier(sync)
-    
+
     for root, dirs, files in os.walk(source):
         if '@@Zope' in dirs:
             dirs.remove('@@Zope')

Modified: zope.app.fssync/branches/jim-hack/src/zope/app/fssync/ssh.py
===================================================================
--- zope.app.fssync/branches/jim-hack/src/zope/app/fssync/ssh.py	2009-02-20 20:52:45 UTC (rev 96854)
+++ zope.app.fssync/branches/jim-hack/src/zope/app/fssync/ssh.py	2009-02-20 21:20:08 UTC (rev 96855)
@@ -119,7 +119,7 @@
         self.channel.invoke_subsystem('zsync')
         self.channelr = self.channel.makefile('rb')
         self.channelw = self.channel.makefile('wb')
-        
+
         # start sending request
         self.channelw.write('%s %s\r\n' % (method, path))