archival: simplify code and drop message about Python 2.5
authorAugie Fackler <augie@google.com>
Mon, 21 Nov 2016 18:17:02 -0500
changeset 30488 798bcb1274dd
parent 30487 f7d66746ec18
child 30489 b0a8337ba9af
archival: simplify code and drop message about Python 2.5
mercurial/archival.py
--- a/mercurial/archival.py	Mon Nov 21 17:52:32 2016 -0500
+++ b/mercurial/archival.py	Mon Nov 21 18:17:02 2016 -0500
@@ -141,7 +141,7 @@
         self.mtime = mtime
         self.fileobj = None
 
-        def taropen(name, mode, fileobj=None):
+        def taropen(mode, name='', fileobj=None):
             if kind == 'gz':
                 mode = mode[0]
                 if not fileobj:
@@ -155,10 +155,9 @@
                 return tarfile.open(name, mode + kind, fileobj)
 
         if isinstance(dest, str):
-            self.z = taropen(dest, mode='w:')
+            self.z = taropen('w:', name=dest)
         else:
-            # Python 2.5-2.5.1 have a regression that requires a name arg
-            self.z = taropen(name='', mode='w|', fileobj=dest)
+            self.z = taropen('w|', fileobj=dest)
 
     def addfile(self, name, mode, islink, data):
         i = tarfile.TarInfo(name)