Merge lp:~barryprice/swoffsite/revert-to-py2 into lp:swoffsite

[Barry Price]

Revert the previous changes, we'll stick with py2 for now

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Review Bot (canonical-is-reviewbot)]

Proxy approval for hloeung

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 51

=== modified file 'swoffsite.py'
--- swoffsite.py	2023-10-11 03:18:48 +0000
+++ swoffsite.py	2023-10-11 03:44:22 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 
 ## XXX: This is a stub
 
 
=== modified file 'swoffsite/mirror.py'
--- swoffsite/mirror.py	2023-10-11 03:18:48 +0000
+++ swoffsite/mirror.py	2023-10-11 03:44:22 +0000
@@ -18,7 +18,7 @@
 
 __all__ = ['s3_walk', 'swift_walk', 'mirror_swift_to_s3']
 
-from io import StringIO
+from cStringIO import StringIO
 from datetime import datetime, timedelta, tzinfo
 import fnmatch
 import multiprocessing
@@ -76,7 +76,7 @@
 
     Returns (container, name, md5)
     '''
-    assert isinstance(s3_key_name, str)
+    assert isinstance(s3_key_name, basestring)
     container, rest = s3_key_name.split('/', 1)
     assert rest.endswith('.gpg')
     rest = rest[:-4]
@@ -313,7 +313,7 @@
             log.debug("NOT DRYRUN, actual upload to S3")
             s3_bucket = s3_con.get_bucket(bucket, validate=False)
             s3_key = s3_bucket.new_key(get_s3_name(container, name, md5))
-            for k, v in list(swift_headers.items()):
+            for k, v in swift_headers.items():
                 if k in UNWANTED_SWIFT_METADATA:
                     # Ignore HTTP headers smooshed with our metadata,
                     # and similar.
@@ -362,7 +362,7 @@
     content_type = None
     content_length = None
     is_dlo = False
-    for k, v in list(s3_key.metadata.items()):
+    for k, v in s3_key.metadata.items():
         if k in UNWANTED_SWIFT_METADATA:
             continue
         if k == 'content-type':
 
=== modified file 'swoffsite/streams.py'
--- swoffsite/streams.py	2023-10-11 01:54:38 +0000
+++ swoffsite/streams.py	2023-10-11 03:44:22 +0000
@@ -59,7 +59,7 @@
 
     def _next_chunk(self):
         try:
-            return next(self._chunks)
+            return self._chunks.next()
         except StopIteration:
             return None