Merge lp:~mterry/duplicity/typos into lp:~duplicity-team/duplicity/0.7-series

[Michael Terry]

[Michael Terry (mterry)]

Here are some typo fixes I found when using pydev+eclipse.

[lp:~mterry/duplicity/typos]

626. By Michael Terry on 2009-12-13

whoops, and this typo

[Kenneth Loafman (kenneth-loafman)]

I tried to merge this in after optparse and typos-0.6 and got 'nothing to do' from the merge command.

[Michael Terry (mterry)]

Huh. This branch was for 0.7. typos-0.6 and optparse were for 0.6. If you tried to merge this with 0.6, I could see you getting that message, because typos-0.6 already made same changes?

[Kenneth Loafman (kenneth-loafman)]

Not enough coffee, obviously!

Michael Terry wrote:
> Huh. This branch was for 0.7. typos-0.6 and optparse were for 0.6. If you tried to merge this with 0.6, I could see you getting that message, because typos-0.6 already made same changes?

=== modified file 'duplicity/backends/hsibackend.py'
--- duplicity/backends/hsibackend.py	2009-04-01 15:07:45 +0000
+++ duplicity/backends/hsibackend.py	2009-12-13 23:47:12 +0000
@@ -60,7 +60,7 @@
         return filter(lambda x: x, l)
 
     def delete(self, filename_list):
-        assert len(filename_ist) > 0
+        assert len(filename_list) > 0
         pathlist = map(lambda fn: self.remote_prefix + fn, filename_list)
         for fn in filename_list:
             commandline = '%s "rm %s%s"' % (hsi_command, self.remote_prefix, fn)
 
=== modified file 'duplicity/path.py'
--- duplicity/path.py	2009-09-02 11:10:31 +0000
+++ duplicity/path.py	2009-12-13 23:47:12 +0000
@@ -260,7 +260,7 @@
                     ti.type = tarfile.BLKTYPE
                 ti.devmajor, ti.devminor = self.devnums
             else:
-                raise PathError("Unrecognized type " + str(self.type))
+                raise PathException("Unrecognized type " + str(self.type))
 
             ti.mode = self.mode
             ti.uid, ti.gid = self.stat.st_uid, self.stat.st_gid
 
=== modified file 'duplicity/selection.py'
--- duplicity/selection.py	2009-10-29 18:44:14 +0000
+++ duplicity/selection.py	2009-12-13 23:47:12 +0000
@@ -271,7 +271,7 @@
 Useful file specifications begin with the base directory or some
 pattern (such as '**') which matches the base directory.""") %
             (exc, self.prefix), log.ErrorCode.file_prefix_error)
-        elif isinstance(e, GlobbingError):
+        elif isinstance(exc, GlobbingError):
             log.FatalError(_("Fatal Error while processing expression\n"
                              "%s") % exc, log.ErrorCode.globbing_error)
         else:
 
=== modified file 'duplicity/statistics.py'
--- duplicity/statistics.py	2009-04-02 14:47:12 +0000
+++ duplicity/statistics.py	2009-12-13 23:47:12 +0000
@@ -119,10 +119,10 @@
         if line[-1] == "\n":
             line = line[:-1]
         lineparts = line.split(" ")
-        if len(lineparts) < len(stat_file_attrs):
+        if len(lineparts) < len(self.stat_file_attrs):
             error()
-        for attr, val_string in zip(stat_file_attrs,
-                                    lineparts[-len(stat_file_attrs):]):
+        for attr, val_string in zip(self.stat_file_attrs,
+                                    lineparts[-len(self.stat_file_attrs):]):
             try:
                 val = long(val_string)
             except ValueError:
@@ -288,7 +288,7 @@
 
     def get_statsobj_copy(self):
         """Return new StatsObj object with same stats as self"""
-        s = StatObj()
+        s = StatsObj()
         for attr in self.stat_attrs:
             s.set_stat(attr, self.get_stat(attr))
         return s
 
=== modified file 'testing/GnuPGInterfacetest.py'
--- testing/GnuPGInterfacetest.py	2009-06-06 17:35:19 +0000
+++ testing/GnuPGInterfacetest.py	2009-12-13 23:47:12 +0000
@@ -94,7 +94,7 @@
 
         creations = []
         # We'll handle the passphrase manually
-        if passphrase != None: handles.append('passphrase')
+        if passphrase != None: proc.handles.append('passphrase')
 
         attachments = { 'stdin': stdin, 'stdout': stdout }
 
 
=== modified file 'testing/collectionstest.py'
--- testing/collectionstest.py	2009-09-25 14:20:10 +0000
+++ testing/collectionstest.py	2009-12-13 23:47:12 +0000
@@ -218,7 +218,7 @@
                       "duplicity-full.2002-08-15T01:01:01-07:00.vol1.difftar.gpg",
                       "duplicity-inc.2000-08-17T16:17:01-07:00.to.2000-08-18T00:04:30-07:00.manifest.gpg",
                       "duplicity-inc.2000-08-17T16:17:01-07:00.to.2000-08-18T00:04:30-07:00.vol1.difftar.gpg"]
-        local_received_list, remote_received_list = cs.get_extraneous()
+        local_received_list, remote_received_list = cs.get_extraneous(False)
         errors = []
         for filename in remote_received_list:
             if filename not in right_list:
 
=== modified file 'testing/patchdirtest.py'
--- testing/patchdirtest.py	2009-09-25 14:20:10 +0000
+++ testing/patchdirtest.py	2009-12-13 23:47:12 +0000
@@ -314,7 +314,7 @@
 
         def try_seq(input_seq, correct_output_seq):
             normed = patchdir.normalize_ps(input_seq)
-            assert normed == correct_output_seq, (normed, correct_output_eq)
+            assert normed == correct_output_seq, (normed, correct_output_seq)
 
         try_seq(seq1, seq1)
         try_seq(seq2, [de])