Merge lp:~mgorse/duplicity/0.8-series into lp:~duplicity-team/duplicity/0.8-series

[Mgorse]

Python3 fixes

[lp:~mgorse/duplicity/0.8-series]

1349. By Kenneth Loafman on 2019-02-25

* Merged in lp:~mgorse/duplicity/0.8-series
  - More changes for unicode and py3 support

=== modified file 'duplicity/backends/lftpbackend.py'
--- duplicity/backends/lftpbackend.py	2018-11-29 19:00:15 +0000
+++ duplicity/backends/lftpbackend.py	2019-02-22 20:25:46 +0000
@@ -132,12 +132,12 @@
         self.tempfile.write(u"set net:max-retries %s\n" % globals.num_retries)
         self.tempfile.write(u"set ftp:passive-mode %s\n" % self.conn_opt)
         if log.getverbosity() >= log.DEBUG:
-            self.tempfd.write(u"debug\n")
+            self.tempfile.write(u"debug\n")
         if self.parsed_url.scheme == u'ftpes':
             self.tempfile.write(u"open %s %s\n" % (self.authflag, self.url_string.replace(u'ftpes', u'ftp')))
         else:
             self.tempfile.write(u"open %s %s\n" % (self.authflag, self.url_string))
-        os.close(self.tempfd)
+        self.tempfile.close()
         # print settings in debug mode
         if log.getverbosity() >= log.DEBUG:
             f = open(self.tempname, u'r')

=== modified file 'duplicity/collections.py'
--- duplicity/collections.py	2018-11-29 19:00:15 +0000
+++ duplicity/collections.py	2019-02-22 20:25:46 +0000
@@ -193,7 +193,7 @@
                     pass
         util.release_lockfile()
 
-    def __unicode__(self):
+    def __str__(self):
         u"""
         For now just list files in set
         """
@@ -657,7 +657,7 @@
 
         return l
 
-    def __unicode__(self):
+    def __str__(self):
         u"""
         Return string summary of the collection
         """
@@ -1228,7 +1228,7 @@
         self.filepath = filepath
         self.fileinfo_list = fileinfo_list
 
-    def __unicode__(self):
+    def __str__(self):
         set_schema = u"%20s   %30s  %20s"
         l = [u"-------------------------",
              _(u"File: %s") % (self.filepath),

=== modified file 'duplicity/lazy.py'
--- duplicity/lazy.py	2018-11-29 19:00:15 +0000
+++ duplicity/lazy.py	2019-02-22 20:25:46 +0000
@@ -206,7 +206,11 @@
 
         def make_iterator(fork_num):
             while(1):
-                yield get_next(fork_num)
+                try:
+                    ret = get_next(fork_num)
+                except StopIteration:
+                    return
+                yield ret
 
         return tuple(map(make_iterator, list(range(num_of_forks))))
 
@@ -230,7 +234,10 @@
         while(1):
             if self.a_leading_by >= 0:
                 # a is in front, add new element
-                elem = next(iter)  # exception will be passed
+                try:
+                    elem = next(iter)
+                except StopIteration:
+                    return
                 buf.append(elem)
             else:
                 # b is in front, subtract an element
@@ -244,7 +251,10 @@
         while(1):
             if self.a_leading_by <= 0:
                 # b is in front, add new element
-                elem = next(iter)  # exception will be passed
+                try:
+                    elem = next(iter)
+                except StopIteration:
+                    return
                 buf.append(elem)
             else:
                 # a is in front, subtract an element

=== modified file 'duplicity/patchdir.py'
--- duplicity/patchdir.py	2018-11-29 19:00:15 +0000
+++ duplicity/patchdir.py	2019-02-22 20:25:46 +0000
@@ -128,7 +128,7 @@
     while 1:
         # This section relevant when a multivol diff is last in tar
         if not tarinfo_list[0]:
-            raise StopIteration
+            return
         if multivol_fileobj and not multivol_fileobj.at_end:
             multivol_fileobj.close()  # aborting in middle of multivol
             continue
@@ -149,7 +149,10 @@
             else:
                 ropath.setfileobj(diff_tarfile.extractfile(tarinfo_list[0]))
         yield ropath
-        tarinfo_list[0] = next(tar_iter)
+        try:
+            tarinfo_list[0] = next(tar_iter)
+        except StopIteration:
+            return
 
 
 def get_index_from_tarinfo(tarinfo):

=== modified file 'duplicity/path.py'
--- duplicity/path.py	2018-11-29 19:00:15 +0000
+++ duplicity/path.py	2019-02-22 20:25:46 +0000
@@ -487,7 +487,7 @@
             other.stat = stat
             other.mode = self.mode
 
-    def __unicode__(self):
+    def __str__(self):
         u"""Return string representation"""
         return u"(%s %s)" % (util.uindex(self.index), self.type)
 

=== modified file 'duplicity/statistics.py'
--- duplicity/statistics.py	2018-11-29 19:00:15 +0000
+++ duplicity/statistics.py	2019-02-22 20:25:46 +0000
@@ -118,7 +118,7 @@
             if use_repr:
                 # use repr to quote newlines in relative filename, then
                 # take of leading and trailing quote and quote spaces.
-                filename = self.space_regex.sub(u"\\x20", repr(filename))
+                filename = self.space_regex.sub(u"\\\\x20", repr(filename))
                 n = 1
                 if filename[0] == u'u':
                     n = 2

=== modified file 'duplicity/tempdir.py'
--- duplicity/tempdir.py	2018-11-29 19:00:15 +0000
+++ duplicity/tempdir.py	2019-02-22 20:25:46 +0000
@@ -174,7 +174,7 @@
         try:
             self.__tempcount = self.__tempcount + 1
             suffix = u"-%d" % (self.__tempcount,)
-            filename = tempfile.mktemp(suffix, u"mktemp-", util.fsdecode(self.__dir))
+            filename = util.fsencode(tempfile.mktemp(suffix, u"mktemp-", self.__dir))
 
             log.Debug(_(u"Registering (mktemp) temporary file %s") % util.fsdecode(filename))
             self.__pending[filename] = None

=== modified file 'po/duplicity.pot'
--- po/duplicity.pot	2018-12-23 16:52:31 +0000
+++ po/duplicity.pot	2019-02-22 20:25:46 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Kenneth Loafman <[e-mail]>\n"
-"POT-Creation-Date: 2018-12-21 09:31-0600\n"
+"POT-Creation-Date: 2019-02-22 13:13-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -507,8 +507,8 @@
 #. --archive-dir <path>
 #: ../duplicity/commandline.py:290 ../duplicity/commandline.py:300
 #: ../duplicity/commandline.py:321 ../duplicity/commandline.py:395
-#: ../duplicity/commandline.py:413 ../duplicity/commandline.py:626
-#: ../duplicity/commandline.py:659 ../duplicity/commandline.py:858
+#: ../duplicity/commandline.py:413 ../duplicity/commandline.py:634
+#: ../duplicity/commandline.py:667 ../duplicity/commandline.py:866
 msgid "path"
 msgstr ""
 
@@ -519,8 +519,8 @@
 #. Used in usage help to represent an ID for a GnuPG key. Example:
 #. --encrypt-key <gpg_key_id>
 #: ../duplicity/commandline.py:316 ../duplicity/commandline.py:323
-#: ../duplicity/commandline.py:419 ../duplicity/commandline.py:610
-#: ../duplicity/commandline.py:831
+#: ../duplicity/commandline.py:419 ../duplicity/commandline.py:618
+#: ../duplicity/commandline.py:839
 msgid "gpg-key-id"
 msgstr ""
 
@@ -529,7 +529,7 @@
 #. Example:
 #. --exclude <shell_pattern>
 #: ../duplicity/commandline.py:331 ../duplicity/commandline.py:444
-#: ../duplicity/commandline.py:881
+#: ../duplicity/commandline.py:889
 msgid "shell_pattern"
 msgstr ""
 
@@ -538,7 +538,7 @@
 #: ../duplicity/commandline.py:337 ../duplicity/commandline.py:346
 #: ../duplicity/commandline.py:353 ../duplicity/commandline.py:446
 #: ../duplicity/commandline.py:453 ../duplicity/commandline.py:466
-#: ../duplicity/commandline.py:827
+#: ../duplicity/commandline.py:835
 msgid "filename"
 msgstr ""
 
@@ -551,7 +551,7 @@
 #. point in time, as described in the documentation. Example:
 #. duplicity remove-older-than time [options] target_url
 #: ../duplicity/commandline.py:364 ../duplicity/commandline.py:407
-#: ../duplicity/commandline.py:528 ../duplicity/commandline.py:913
+#: ../duplicity/commandline.py:528 ../duplicity/commandline.py:921
 msgid "time"
 msgstr ""
 
@@ -559,8 +559,8 @@
 #. header.) Example:
 #. duplicity [full|incremental] [options] source_dir target_url
 #: ../duplicity/commandline.py:415 ../duplicity/commandline.py:508
-#: ../duplicity/commandline.py:531 ../duplicity/commandline.py:618
-#: ../duplicity/commandline.py:846
+#: ../duplicity/commandline.py:531 ../duplicity/commandline.py:626
+#: ../duplicity/commandline.py:854
 msgid "options"
 msgstr ""
 
@@ -586,9 +586,9 @@
 #: ../duplicity/commandline.py:471 ../duplicity/commandline.py:493
 #: ../duplicity/commandline.py:505 ../duplicity/commandline.py:514
 #: ../duplicity/commandline.py:558 ../duplicity/commandline.py:563
-#: ../duplicity/commandline.py:567 ../duplicity/commandline.py:581
-#: ../duplicity/commandline.py:587 ../duplicity/commandline.py:591
-#: ../duplicity/commandline.py:654 ../duplicity/commandline.py:841
+#: ../duplicity/commandline.py:567 ../duplicity/commandline.py:586
+#: ../duplicity/commandline.py:592 ../duplicity/commandline.py:596
+#: ../duplicity/commandline.py:662 ../duplicity/commandline.py:849
 msgid "number"
 msgstr ""
 
@@ -597,25 +597,29 @@
 msgid "backup name"
 msgstr ""
 
-#: ../duplicity/commandline.py:576
+#: ../duplicity/commandline.py:581
 msgid "policy"
 msgstr ""
 
+#: ../duplicity/commandline.py:599
+msgid "Hot|Cool|Archive"
+msgstr ""
+
 #. noun
-#: ../duplicity/commandline.py:594 ../duplicity/commandline.py:597
-#: ../duplicity/commandline.py:812
+#: ../duplicity/commandline.py:602 ../duplicity/commandline.py:605
+#: ../duplicity/commandline.py:820
 msgid "command"
 msgstr ""
 
-#: ../duplicity/commandline.py:600
+#: ../duplicity/commandline.py:608
 msgid "pyrax|cloudfiles"
 msgstr ""
 
-#: ../duplicity/commandline.py:621
+#: ../duplicity/commandline.py:629
 msgid "pem formatted bundle of certificate authorities"
 msgstr ""
 
-#: ../duplicity/commandline.py:622
+#: ../duplicity/commandline.py:630
 msgid "path to a folder with certificate authority files"
 msgstr ""
 
@@ -625,113 +629,113 @@
 #. --backend-retry-delay <seconds>
 #. Used in usage help. Example:
 #. --timeout <seconds>
-#: ../duplicity/commandline.py:631 ../duplicity/commandline.py:665
-#: ../duplicity/commandline.py:875
+#: ../duplicity/commandline.py:639 ../duplicity/commandline.py:673
+#: ../duplicity/commandline.py:883
 msgid "seconds"
 msgstr ""
 
 #. abbreviation for "character" (noun)
-#: ../duplicity/commandline.py:637 ../duplicity/commandline.py:809
+#: ../duplicity/commandline.py:645 ../duplicity/commandline.py:817
 msgid "char"
 msgstr ""
 
-#: ../duplicity/commandline.py:775
+#: ../duplicity/commandline.py:783
 #, python-format
 msgid "Using archive dir: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:776
+#: ../duplicity/commandline.py:784
 #, python-format
 msgid "Using backup name: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:783
+#: ../duplicity/commandline.py:791
 #, python-format
 msgid "Command line error: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:784
+#: ../duplicity/commandline.py:792
 msgid "Enter 'duplicity --help' for help screen."
 msgstr ""
 
 #. Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other_host[:port]//absolute_path
-#: ../duplicity/commandline.py:797
+#: ../duplicity/commandline.py:805
 msgid "absolute_path"
 msgstr ""
 
 #. Used in usage help. Example:
 #. tahoe://alias/some_dir
-#: ../duplicity/commandline.py:801
+#: ../duplicity/commandline.py:809
 msgid "alias"
 msgstr ""
 
 #. Used in help to represent a "bucket name" for Amazon Web
 #. Services' Simple Storage Service (S3). Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:806
+#: ../duplicity/commandline.py:814
 msgid "bucket_name"
 msgstr ""
 
 #. Used in usage help to represent the name of a container in
 #. Amazon Web Services' Cloudfront. Example:
 #. cf+http://container_name
-#: ../duplicity/commandline.py:817
+#: ../duplicity/commandline.py:825
 msgid "container_name"
 msgstr ""
 
 #. noun
-#: ../duplicity/commandline.py:820
+#: ../duplicity/commandline.py:828
 msgid "count"
 msgstr ""
 
 #. Used in usage help to represent the name of a file directory
-#: ../duplicity/commandline.py:823
+#: ../duplicity/commandline.py:831
 msgid "directory"
 msgstr ""
 
 #. Used in usage help, e.g. to represent the name of a code
 #. module. Example:
 #. rsync://user[:password]@other.host[:port]::/module/some_dir
-#: ../duplicity/commandline.py:836
+#: ../duplicity/commandline.py:844
 msgid "module"
 msgstr ""
 
 #. Used in usage help to represent an internet hostname. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:850
+#: ../duplicity/commandline.py:858
 msgid "other.host"
 msgstr ""
 
 #. Used in usage help. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:854
+#: ../duplicity/commandline.py:862
 msgid "password"
 msgstr ""
 
 #. Used in usage help to represent a TCP port number. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:862
+#: ../duplicity/commandline.py:870
 msgid "port"
 msgstr ""
 
 #. Used in usage help. This represents a string to be used as a
 #. prefix to names for backup files created by Duplicity. Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:867
+#: ../duplicity/commandline.py:875
 msgid "prefix"
 msgstr ""
 
 #. Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other.host[:port]/relative_path
-#: ../duplicity/commandline.py:871
+#: ../duplicity/commandline.py:879
 msgid "relative_path"
 msgstr ""
 
 #. Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory. Example:
 #. file:///some_dir
-#: ../duplicity/commandline.py:886
+#: ../duplicity/commandline.py:894
 msgid "some_dir"
 msgstr ""
 
@@ -739,14 +743,14 @@
 #. directory or a Unix-style path to a directory where files will be
 #. coming FROM. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:892
+#: ../duplicity/commandline.py:900
 msgid "source_dir"
 msgstr ""
 
 #. Used in usage help to represent a URL files will be coming
 #. FROM. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:897
+#: ../duplicity/commandline.py:905
 msgid "source_url"
 msgstr ""
 
@@ -754,91 +758,91 @@
 #. directory or a Unix-style path to a directory. where files will be
 #. going TO. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:903
+#: ../duplicity/commandline.py:911
 msgid "target_dir"
 msgstr ""
 
 #. Used in usage help to represent a URL files will be going TO.
 #. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:908
+#: ../duplicity/commandline.py:916
 msgid "target_url"
 msgstr ""
 
 #. Used in usage help to represent a user name (i.e. login).
 #. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:918
+#: ../duplicity/commandline.py:926
 msgid "user"
 msgstr ""
 
 #. account id for b2. Example: b2://account_id@bucket/
-#: ../duplicity/commandline.py:921
+#: ../duplicity/commandline.py:929
 msgid "account_id"
 msgstr ""
 
 #. application_key for b2.
 #. Example: b2://account_id:application_key@bucket/
-#: ../duplicity/commandline.py:925
+#: ../duplicity/commandline.py:933
 msgid "application_key"
 msgstr ""
 
 #. Header in usage help
-#: ../duplicity/commandline.py:944
+#: ../duplicity/commandline.py:952
 msgid "Backends and their URL formats:"
 msgstr ""
 
 #. Header in usage help
-#: ../duplicity/commandline.py:976
+#: ../duplicity/commandline.py:984
 msgid "Commands:"
 msgstr ""
 
-#: ../duplicity/commandline.py:1001
+#: ../duplicity/commandline.py:1009
 #, python-format
 msgid "Specified archive directory '%s' does not exist, or is not a directory"
 msgstr ""
 
-#: ../duplicity/commandline.py:1010
+#: ../duplicity/commandline.py:1018
 #, python-format
 msgid ""
 "Sign key should be an 8, 16 alt. 40 character hex string, like 'AA0E73D2'.\n"
 "Received '%s' instead."
 msgstr ""
 
-#: ../duplicity/commandline.py:1070
+#: ../duplicity/commandline.py:1078
 #, python-format
 msgid ""
 "Restore destination directory %s already exists.\n"
 "Will not overwrite."
 msgstr ""
 
-#: ../duplicity/commandline.py:1075
+#: ../duplicity/commandline.py:1083
 #, python-format
 msgid "Verify directory %s does not exist"
 msgstr ""
 
-#: ../duplicity/commandline.py:1081
+#: ../duplicity/commandline.py:1089
 #, python-format
 msgid "Backup source directory %s does not exist."
 msgstr ""
 
-#: ../duplicity/commandline.py:1112
+#: ../duplicity/commandline.py:1120
 #, python-format
 msgid "Command line warning: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:1112
+#: ../duplicity/commandline.py:1120
 msgid ""
 "Selection options --exclude/--include\n"
 "currently work only when backing up,not restoring."
 msgstr ""
 
-#: ../duplicity/commandline.py:1148
+#: ../duplicity/commandline.py:1156
 #, python-format
 msgid "GPG binary is %s, version %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:1175
+#: ../duplicity/commandline.py:1183
 #, python-format
 msgid ""
 "Bad URL '%s'.\n"
@@ -846,7 +850,7 @@
 "\"file:///usr/local\".  See the man page for more information."
 msgstr ""
 
-#: ../duplicity/commandline.py:1205
+#: ../duplicity/commandline.py:1213
 msgid "Main action: "
 msgstr ""
 
@@ -931,12 +935,12 @@
 msgid "Patching %s"
 msgstr ""
 
-#: ../duplicity/patchdir.py:542
+#: ../duplicity/patchdir.py:545
 #, python-format
 msgid "Error '%s' patching %s"
 msgstr ""
 
-#: ../duplicity/patchdir.py:617
+#: ../duplicity/patchdir.py:620
 #, python-format
 msgid "Writing %s of type %s"
 msgstr ""
@@ -1228,17 +1232,17 @@
 msgid "D %s"
 msgstr ""
 
-#: ../duplicity/lazy.py:342
+#: ../duplicity/lazy.py:352
 #, python-format
 msgid "Warning: oldindex %s >= newindex %s"
 msgstr ""
 
-#: ../duplicity/lazy.py:417
+#: ../duplicity/lazy.py:427
 #, python-format
 msgid "Error '%s' processing %s"
 msgstr ""
 
-#: ../duplicity/lazy.py:427
+#: ../duplicity/lazy.py:437
 #, python-format
 msgid "Skipping %s because of previous error"
 msgstr ""