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

Proposed by Michael Terry
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mterry/duplicity/typos
Merge into: lp:~duplicity-team/duplicity/0.7-series
Diff against target: 104 lines (+10/-10)
7 files modified
duplicity/backends/hsibackend.py (+1/-1)
duplicity/path.py (+1/-1)
duplicity/selection.py (+1/-1)
duplicity/statistics.py (+4/-4)
testing/GnuPGInterfacetest.py (+1/-1)
testing/collectionstest.py (+1/-1)
testing/patchdirtest.py (+1/-1)
To merge this branch: bzr merge lp:~mterry/duplicity/typos
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+16104@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

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

lp:~mterry/duplicity/typos updated
626. By Michael Terry

whoops, and this typo

Revision history for this message
Kenneth Loafman (kenneth-loafman) wrote :

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

Revision history for this message
Michael Terry (mterry) 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?

Revision history for this message
Kenneth Loafman (kenneth-loafman) wrote :

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?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/backends/hsibackend.py'
2--- duplicity/backends/hsibackend.py 2009-04-01 15:07:45 +0000
3+++ duplicity/backends/hsibackend.py 2009-12-13 23:47:12 +0000
4@@ -60,7 +60,7 @@
5 return filter(lambda x: x, l)
6
7 def delete(self, filename_list):
8- assert len(filename_ist) > 0
9+ assert len(filename_list) > 0
10 pathlist = map(lambda fn: self.remote_prefix + fn, filename_list)
11 for fn in filename_list:
12 commandline = '%s "rm %s%s"' % (hsi_command, self.remote_prefix, fn)
13
14=== modified file 'duplicity/path.py'
15--- duplicity/path.py 2009-09-02 11:10:31 +0000
16+++ duplicity/path.py 2009-12-13 23:47:12 +0000
17@@ -260,7 +260,7 @@
18 ti.type = tarfile.BLKTYPE
19 ti.devmajor, ti.devminor = self.devnums
20 else:
21- raise PathError("Unrecognized type " + str(self.type))
22+ raise PathException("Unrecognized type " + str(self.type))
23
24 ti.mode = self.mode
25 ti.uid, ti.gid = self.stat.st_uid, self.stat.st_gid
26
27=== modified file 'duplicity/selection.py'
28--- duplicity/selection.py 2009-10-29 18:44:14 +0000
29+++ duplicity/selection.py 2009-12-13 23:47:12 +0000
30@@ -271,7 +271,7 @@
31 Useful file specifications begin with the base directory or some
32 pattern (such as '**') which matches the base directory.""") %
33 (exc, self.prefix), log.ErrorCode.file_prefix_error)
34- elif isinstance(e, GlobbingError):
35+ elif isinstance(exc, GlobbingError):
36 log.FatalError(_("Fatal Error while processing expression\n"
37 "%s") % exc, log.ErrorCode.globbing_error)
38 else:
39
40=== modified file 'duplicity/statistics.py'
41--- duplicity/statistics.py 2009-04-02 14:47:12 +0000
42+++ duplicity/statistics.py 2009-12-13 23:47:12 +0000
43@@ -119,10 +119,10 @@
44 if line[-1] == "\n":
45 line = line[:-1]
46 lineparts = line.split(" ")
47- if len(lineparts) < len(stat_file_attrs):
48+ if len(lineparts) < len(self.stat_file_attrs):
49 error()
50- for attr, val_string in zip(stat_file_attrs,
51- lineparts[-len(stat_file_attrs):]):
52+ for attr, val_string in zip(self.stat_file_attrs,
53+ lineparts[-len(self.stat_file_attrs):]):
54 try:
55 val = long(val_string)
56 except ValueError:
57@@ -288,7 +288,7 @@
58
59 def get_statsobj_copy(self):
60 """Return new StatsObj object with same stats as self"""
61- s = StatObj()
62+ s = StatsObj()
63 for attr in self.stat_attrs:
64 s.set_stat(attr, self.get_stat(attr))
65 return s
66
67=== modified file 'testing/GnuPGInterfacetest.py'
68--- testing/GnuPGInterfacetest.py 2009-06-06 17:35:19 +0000
69+++ testing/GnuPGInterfacetest.py 2009-12-13 23:47:12 +0000
70@@ -94,7 +94,7 @@
71
72 creations = []
73 # We'll handle the passphrase manually
74- if passphrase != None: handles.append('passphrase')
75+ if passphrase != None: proc.handles.append('passphrase')
76
77 attachments = { 'stdin': stdin, 'stdout': stdout }
78
79
80=== modified file 'testing/collectionstest.py'
81--- testing/collectionstest.py 2009-09-25 14:20:10 +0000
82+++ testing/collectionstest.py 2009-12-13 23:47:12 +0000
83@@ -218,7 +218,7 @@
84 "duplicity-full.2002-08-15T01:01:01-07:00.vol1.difftar.gpg",
85 "duplicity-inc.2000-08-17T16:17:01-07:00.to.2000-08-18T00:04:30-07:00.manifest.gpg",
86 "duplicity-inc.2000-08-17T16:17:01-07:00.to.2000-08-18T00:04:30-07:00.vol1.difftar.gpg"]
87- local_received_list, remote_received_list = cs.get_extraneous()
88+ local_received_list, remote_received_list = cs.get_extraneous(False)
89 errors = []
90 for filename in remote_received_list:
91 if filename not in right_list:
92
93=== modified file 'testing/patchdirtest.py'
94--- testing/patchdirtest.py 2009-09-25 14:20:10 +0000
95+++ testing/patchdirtest.py 2009-12-13 23:47:12 +0000
96@@ -314,7 +314,7 @@
97
98 def try_seq(input_seq, correct_output_seq):
99 normed = patchdir.normalize_ps(input_seq)
100- assert normed == correct_output_seq, (normed, correct_output_eq)
101+ assert normed == correct_output_seq, (normed, correct_output_seq)
102
103 try_seq(seq1, seq1)
104 try_seq(seq2, [de])

Subscribers

People subscribed via source and target branches