Merge lp:~gholt/swift/lp837428 into lp:~dweimer/swift/lp837428

[gholt]

Adds a unit test and PEP8 fixes.

=== modified file 'swift/proxy/server.py'
--- swift/proxy/server.py	2011-08-30 15:11:26 +0000
+++ swift/proxy/server.py	2011-08-30 20:37:25 +0000
@@ -648,8 +648,9 @@
                     if source:
                         ts = float(source.getheader('x-put-timestamp') or
                                    source.getheader('x-timestamp') or 0)
-                        pts = float(possible_source.getheader('x-put-timestamp') or
-                                    possible_source.getheader('x-timestamp') or 0)
+                        pts = float(
+                            possible_source.getheader('x-put-timestamp') or
+                            possible_source.getheader('x-timestamp') or 0)
                         if pts > ts:
                             source = possible_source
                     else:

=== modified file 'test/unit/proxy/test_server.py'
--- test/unit/proxy/test_server.py	2011-08-22 15:22:50 +0000
+++ test/unit/proxy/test_server.py	2011-08-30 20:37:25 +0000
@@ -182,6 +182,8 @@
                             self.etag or '"68b329da9893e34099c7d8ad5cb9c940"',
                        'x-works': 'yes',
                        }
+            if not self.timestamp:
+                del headers['x-timestamp']
             try:
                 if container_ts_iter.next() is False:
                     headers['x-container-timestamp'] = '1'
@@ -1079,6 +1081,7 @@
             test_status_map((200, 200, 200), 200, ('1', '3', '2'), '3')
             test_status_map((200, 200, 200), 200, ('1', '3', '1'), '3')
             test_status_map((200, 200, 200), 200, ('3', '3', '1'), '3')
+            test_status_map((200, 200, 200), 200, (None, None, None), None)
 
     def test_GET_newest(self):
         with save_globals():