Merge lp:~gz/brz/lint_W1_W2_W3 into lp:brz

Proposed by Martin Packman
Status: Merged
Approved by: Martin Packman
Approved revision: 7197
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~gz/brz/lint_W1_W2_W3
Merge into: lp:brz
Diff against target: 688 lines (+69/-77)
41 files modified
apport/source_brz.py (+3/-3)
breezy/bzr/bzrdir.py (+1/-1)
breezy/bzr/dirstate.py (+2/-2)
breezy/bzr/index.py (+1/-1)
breezy/bzr/inventory.py (+1/-1)
breezy/bzr/workingtree_4.py (+1/-1)
breezy/config.py (+2/-2)
breezy/counted_lock.py (+2/-2)
breezy/diff.py (+2/-2)
breezy/foreign.py (+1/-1)
breezy/globbing.py (+3/-3)
breezy/help_topics/__init__.py (+4/-4)
breezy/plugins/bash_completion/bashcomp.py (+1/-1)
breezy/plugins/fastimport/cmds.py (+1/-1)
breezy/plugins/launchpad/__init__.py (+1/-1)
breezy/plugins/upload/__init__.py (+2/-2)
breezy/repository.py (+1/-1)
breezy/tests/blackbox/test_uncommit.py (+1/-1)
breezy/tests/per_controldir_colo/__init__.py (+1/-1)
breezy/tests/per_controldir_colo/test_unsupported.py (+1/-1)
breezy/tests/per_foreign_vcs/test_branch.py (+2/-2)
breezy/tests/scenarios.py (+1/-1)
breezy/tests/script.py (+1/-1)
breezy/tests/test_gpg.py (+2/-2)
breezy/tests/test_help.py (+9/-9)
breezy/tests/test_script.py (+8/-9)
breezy/transform.py (+1/-1)
breezy/transport/__init__.py (+1/-1)
breezy/transport/log.py (+1/-1)
breezy/transport/trace.py (+1/-1)
breezy/tree.py (+1/-1)
doc/en/conf.py (+0/-1)
profile_imports.py (+0/-1)
setup.cfg (+0/-4)
tools/brz_epydoc_uid.py (+0/-1)
tools/check-newsbugs.py (+1/-1)
tools/generate_docs.py (+2/-2)
tools/generate_release_notes.py (+1/-1)
tools/riodemo.py (+3/-3)
tools/rst2html.py (+1/-1)
tools/win32/brz_postinstall.py (+1/-1)
To merge this branch: bzr merge lp:~gz/brz/lint_W1_W2_W3
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+358968@code.launchpad.net

Commit message

Fix remaining whitespace lint in codebase

Description of the change

Fix remaining whitespace lint in codebase

Enables rules W191, W291, W293, and W391 for flake8.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Significant whitespace? (:

On November 18, 2018 8:44:05 PM UTC, The Breezy Bot <email address hidden> wrote:
>Running landing tests failed
>https://ci.breezy-vcs.org/job/brz/job/brz-land/98/
>--
>https://code.launchpad.net/~gz/brz/lint_W1_W2_W3/+merge/358968
>You are reviewing the proposed merge of lp:~gz/brz/lint_W1_W2_W3 into
>lp:brz.

lp:~gz/brz/lint_W1_W2_W3 updated
7197. By Martin Packman

Fix bt.test_script error that needs trailing space

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apport/source_brz.py'
2--- apport/source_brz.py 2017-07-30 16:59:50 +0000
3+++ apport/source_brz.py 2018-11-20 21:26:00 +0000
4@@ -24,7 +24,7 @@
5 if line == '\n':
6 blanks += 1
7 brz_log_tail.append(line)
8- if blanks >= 2:
9+ if blanks >= 2:
10 break
11
12 brz_log_tail.reverse()
13@@ -36,7 +36,7 @@
14 if 'BrzPlugins' not in report:
15 # may already be present in-process
16 report['BrzPlugins'] = command_output(['brz', 'plugins', '-v'])
17-
18+
19 # by default assume brz crashes are upstream bugs; this relies on
20 # having a brz entry under /etc/apport/crashdb.conf.d/
21 report['CrashDB'] = 'brz'
22@@ -49,5 +49,5 @@
23 #attach_file_if_exists(report,
24 # os.path.join(dot_brz, 'locations.conf', 'BrzLocations')
25
26-
27+
28 # vim: expandtab shiftwidth=4
29
30=== modified file 'breezy/bzr/bzrdir.py'
31--- breezy/bzr/bzrdir.py 2018-11-16 18:33:17 +0000
32+++ breezy/bzr/bzrdir.py 2018-11-20 21:26:00 +0000
33@@ -669,7 +669,7 @@
34
35 This is true IF and ONLY IF the filename is part of the namespace
36 reserved for bzr control dirs. Currently this is the '.bzr' directory
37- in the root of the root_transport.
38+ in the root of the root_transport.
39 """
40 # this might be better on the BzrDirFormat class because it refers to
41 # all the possible bzrdir disk formats.
42
43=== modified file 'breezy/bzr/dirstate.py'
44--- breezy/bzr/dirstate.py 2018-11-12 01:41:38 +0000
45+++ breezy/bzr/dirstate.py 2018-11-20 21:26:00 +0000
46@@ -28,7 +28,7 @@
47 WHOLE_NUMBER = {digit}, digit;
48 BOOLEAN = "y" | "n";
49 REVISION_ID = a non-empty utf8 string;
50-
51+
52 dirstate format = header line, full checksum, row count, parent details,
53 ghost_details, entries;
54 header line = "#bazaar dirstate flat format 3", NL;
55@@ -3578,7 +3578,7 @@
56 """Compare an entry and real disk to generate delta information.
57
58 :param path_info: top_relpath, basename, kind, lstat, abspath for
59- the path of entry. If None, then the path is considered absent in
60+ the path of entry. If None, then the path is considered absent in
61 the target (Perhaps we should pass in a concrete entry for this ?)
62 Basename is returned as a utf8 string because we expect this
63 tuple will be ignored, and don't want to take the time to
64
65=== modified file 'breezy/bzr/index.py'
66--- breezy/bzr/index.py 2018-11-12 01:41:38 +0000
67+++ breezy/bzr/index.py 2018-11-20 21:26:00 +0000
68@@ -310,7 +310,7 @@
69 def finish(self):
70 """Finish the index.
71
72- :returns: cBytesIO holding the full context of the index as it
73+ :returns: cBytesIO holding the full context of the index as it
74 should be written to disk.
75 """
76 lines = [_SIGNATURE]
77
78=== modified file 'breezy/bzr/inventory.py'
79--- breezy/bzr/inventory.py 2018-11-16 11:37:47 +0000
80+++ breezy/bzr/inventory.py 2018-11-20 21:26:00 +0000
81@@ -1480,7 +1480,7 @@
82
83 if given [foo-id] we will include
84 TREE_ROOT as interesting parents
85- and
86+ and
87 foo-id, baz-id, frob-id, fringle-id
88 As interesting ids.
89 """
90
91=== modified file 'breezy/bzr/workingtree_4.py'
92--- breezy/bzr/workingtree_4.py 2018-11-16 18:33:17 +0000
93+++ breezy/bzr/workingtree_4.py 2018-11-20 21:26:00 +0000
94@@ -1403,7 +1403,7 @@
95 class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
96 """Dirstate working tree that supports content filtering.
97
98- The dirstate holds the hash and size of the canonical form of the file,
99+ The dirstate holds the hash and size of the canonical form of the file,
100 and most methods must return that.
101 """
102
103
104=== modified file 'breezy/config.py'
105--- breezy/config.py 2018-11-16 12:08:41 +0000
106+++ breezy/config.py 2018-11-20 21:26:00 +0000
107@@ -2105,7 +2105,7 @@
108 :param override_existing: Raise KeyErorr if False and something has
109 already been registered for that key. If True, ignore if there
110 is an existing key (always register the new value).
111- :param fallback: Whether this credential store should be
112+ :param fallback: Whether this credential store should be
113 used as fallback.
114 """
115 return super(CredentialStoreRegistry,
116@@ -2125,7 +2125,7 @@
117 :param override_existing: If True, replace the existing object
118 with the new one. If False, if there is already something
119 registered with the same key, raise a KeyError
120- :param fallback: Whether this credential store should be
121+ :param fallback: Whether this credential store should be
122 used as fallback.
123 """
124 return super(CredentialStoreRegistry, self).register_lazy(
125
126=== modified file 'breezy/counted_lock.py'
127--- breezy/counted_lock.py 2018-11-11 04:08:32 +0000
128+++ breezy/counted_lock.py 2018-11-20 21:26:00 +0000
129@@ -29,7 +29,7 @@
130 This can be used with any object that provides a basic Lock interface,
131 including LockDirs and OS file locks.
132
133- :ivar _token: While a write lock is held, this is the token
134+ :ivar _token: While a write lock is held, this is the token
135 for it.
136 """
137
138@@ -81,7 +81,7 @@
139
140 If the lock was originally acquired in read mode this will fail.
141
142- :param token: If given and the lock is already held,
143+ :param token: If given and the lock is already held,
144 then validate that we already hold the real
145 lock with this token.
146
147
148=== modified file 'breezy/diff.py'
149--- breezy/diff.py 2018-11-16 18:33:17 +0000
150+++ breezy/diff.py 2018-11-20 21:26:00 +0000
151@@ -447,10 +447,10 @@
152 :param to_file: The output stream.
153 :param specific_files: Include only changes to these files - None for all
154 changes.
155- :param external_diff_options: If set, use an external GNU diff and pass
156+ :param external_diff_options: If set, use an external GNU diff and pass
157 these options.
158 :param extra_trees: If set, more Trees to use for looking up file ids
159- :param path_encoding: If set, the path will be encoded as specified,
160+ :param path_encoding: If set, the path will be encoded as specified,
161 otherwise is supposed to be utf8
162 :param format_cls: Formatter class (DiffTree subclass)
163 """
164
165=== modified file 'breezy/foreign.py'
166--- breezy/foreign.py 2018-11-16 12:08:41 +0000
167+++ breezy/foreign.py 2018-11-20 21:26:00 +0000
168@@ -145,7 +145,7 @@
169 """Serialize a foreign revision id for this VCS.
170
171 :param foreign_revid: Foreign revision id
172- :return: Bytestring with serialized revid, will not contain any
173+ :return: Bytestring with serialized revid, will not contain any
174 newlines.
175 """
176 raise NotImplementedError(self.serialize_foreign_revid)
177
178=== modified file 'breezy/globbing.py'
179--- breezy/globbing.py 2018-11-12 01:41:38 +0000
180+++ breezy/globbing.py 2018-11-20 21:26:00 +0000
181@@ -297,9 +297,9 @@
182 """A Globster that supports exception patterns.
183
184 Exceptions are ignore patterns prefixed with '!'. Exception
185- patterns take precedence over regular patterns and cause a
186- matching filename to return None from the match() function.
187- Patterns using a '!!' prefix are highest precedence, and act
188+ patterns take precedence over regular patterns and cause a
189+ matching filename to return None from the match() function.
190+ Patterns using a '!!' prefix are highest precedence, and act
191 as regular ignores. '!!' patterns are useful to establish ignores
192 that apply under paths specified by '!' exception patterns.
193 """
194
195=== modified file 'breezy/help_topics/__init__.py'
196--- breezy/help_topics/__init__.py 2018-11-11 04:08:32 +0000
197+++ breezy/help_topics/__init__.py 2018-11-20 21:26:00 +0000
198@@ -526,10 +526,10 @@
199 repository (a shared repository). Branches can be copied and merged.
200
201 In addition, one branch may be bound to another one. Binding to another
202-branch indicates that commits which happen in this branch must also
203-happen in the other branch. Breezy ensures consistency by not allowing
204-commits when the two branches are out of date. In order for a commit
205-to succeed, it may be necessary to update the current branch using
206+branch indicates that commits which happen in this branch must also
207+happen in the other branch. Breezy ensures consistency by not allowing
208+commits when the two branches are out of date. In order for a commit
209+to succeed, it may be necessary to update the current branch using
210 ``brz update``.
211
212 Related commands::
213
214=== modified file 'breezy/plugins/bash_completion/bashcomp.py'
215--- breezy/plugins/bash_completion/bashcomp.py 2018-11-16 11:54:55 +0000
216+++ breezy/plugins/bash_completion/bashcomp.py 2018-11-20 21:26:00 +0000
217@@ -422,7 +422,7 @@
218 This command generates a shell function which can be used by bash to
219 automatically complete the currently typed command when the user presses
220 the completion key (usually tab).
221-
222+
223 Commonly used like this:
224 eval "`brz bash-completion`"
225 """
226
227=== modified file 'breezy/plugins/fastimport/cmds.py'
228--- breezy/plugins/fastimport/cmds.py 2018-11-11 04:08:32 +0000
229+++ breezy/plugins/fastimport/cmds.py 2018-11-20 21:26:00 +0000
230@@ -85,7 +85,7 @@
231 bzr fast-import project.fi project.bzr
232
233 Numerous commands are provided for generating a fast-import file
234- to use as input.
235+ to use as input.
236 To specify standard input as the input stream, use a
237 source name of '-' (instead of project.fi). If the source name
238 ends in '.gz', it is assumed to be compressed in gzip format.
239
240=== modified file 'breezy/plugins/launchpad/__init__.py'
241--- breezy/plugins/launchpad/__init__.py 2018-11-11 04:08:32 +0000
242+++ breezy/plugins/launchpad/__init__.py 2018-11-20 21:26:00 +0000
243@@ -17,7 +17,7 @@
244 """Launchpad.net integration plugin for Bazaar.
245
246 This plugin provides facilities for working with Bazaar branches that are
247-hosted on Launchpad (http://launchpad.net). It provides a directory service
248+hosted on Launchpad (http://launchpad.net). It provides a directory service
249 for referring to Launchpad branches using the "lp:" prefix. For example,
250 lp:bzr refers to the Bazaar's main development branch and
251 lp:~username/project/branch-name can be used to refer to a specific branch.
252
253=== modified file 'breezy/plugins/upload/__init__.py'
254--- breezy/plugins/upload/__init__.py 2018-11-11 04:08:32 +0000
255+++ breezy/plugins/upload/__init__.py 2018-11-20 21:26:00 +0000
256@@ -32,7 +32,7 @@
257
258 brz upload -r X sftp://user@host/location/on/webserver
259
260-bzr-upload, just as brz does, will remember the location where you upload the
261+bzr-upload, just as brz does, will remember the location where you upload the
262 first time, so you don't need to specify it every time.
263
264 If you need to re-upload the whole working tree for some reason, you can:
265@@ -107,7 +107,7 @@
266 It is possible to upload to a remote location from another remote location by
267 specifying it with the --directory option:
268
269- brz upload sftp://public.example.com --directory sftp://private.example.com
270+ brz upload sftp://public.example.com --directory sftp://private.example.com
271
272 This, together with --auto, can be used to upload when you push to your
273 central branch, rather than when you commit to your local branch.
274
275=== modified file 'breezy/repository.py'
276--- breezy/repository.py 2018-11-11 04:08:32 +0000
277+++ breezy/repository.py 2018-11-20 21:26:00 +0000
278@@ -1144,7 +1144,7 @@
279 :param callback_refs: A dict of check-refs to resolve and callback
280 the check/_check method on the items listed as wanting the ref.
281 see breezy.check.
282- :param check_repo: If False do not check the repository contents, just
283+ :param check_repo: If False do not check the repository contents, just
284 calculate the data callback_refs requires and call them back.
285 """
286 return self._check(revision_ids=revision_ids, callback_refs=callback_refs,
287
288=== modified file 'breezy/tests/blackbox/test_uncommit.py'
289--- breezy/tests/blackbox/test_uncommit.py 2018-07-17 21:50:43 +0000
290+++ breezy/tests/blackbox/test_uncommit.py 2018-11-20 21:26:00 +0000
291@@ -237,7 +237,7 @@
292 script = ScriptRunner()
293 script.run_script(self, """
294 $ cd tree
295-$ brz uncommit --force
296+$ brz uncommit --force
297 2 ...
298 second commit
299 ...
300
301=== modified file 'breezy/tests/per_controldir_colo/__init__.py'
302--- breezy/tests/per_controldir_colo/__init__.py 2018-11-11 04:08:32 +0000
303+++ breezy/tests/per_controldir_colo/__init__.py 2018-11-20 21:26:00 +0000
304@@ -18,7 +18,7 @@
305 """BzrDir implementation tests for colocated branch support.
306
307 These tests check the conformance of the colocated branches support.
308-All bzrdir formats are tested - those that do not suppport colocated branches
309+All bzrdir formats are tested - those that do not suppport colocated branches
310 have the test_unsupported tests run; the others have the test_supported tests
311 run.
312 """
313
314=== modified file 'breezy/tests/per_controldir_colo/test_unsupported.py'
315--- breezy/tests/per_controldir_colo/test_unsupported.py 2018-11-11 04:08:32 +0000
316+++ breezy/tests/per_controldir_colo/test_unsupported.py 2018-11-20 21:26:00 +0000
317@@ -16,7 +16,7 @@
318
319 """Tests for bazaar control directories that do not support colocated branches.
320
321-Colocated branch support is optional, and when it is not supported the methods
322+Colocated branch support is optional, and when it is not supported the methods
323 and attributes colocated branch support added should fail in known ways.
324 """
325
326
327=== modified file 'breezy/tests/per_foreign_vcs/test_branch.py'
328--- breezy/tests/per_foreign_vcs/test_branch.py 2018-11-11 04:08:32 +0000
329+++ breezy/tests/per_foreign_vcs/test_branch.py 2018-11-20 21:26:00 +0000
330@@ -49,8 +49,8 @@
331 class ForeignBranchTests(TestCaseWithTransport):
332 """Basic tests for foreign branch implementations.
333
334- These tests mainly make sure that the implementation covers the required
335- bits of the API and returns reasonable values.
336+ These tests mainly make sure that the implementation covers the required
337+ bits of the API and returns reasonable values.
338 """
339 branch_factory = None # Set to an instance of ForeignBranchFactory by scenario
340
341
342=== modified file 'breezy/tests/scenarios.py'
343--- breezy/tests/scenarios.py 2017-05-23 14:08:03 +0000
344+++ breezy/tests/scenarios.py 2018-11-20 21:26:00 +0000
345@@ -46,7 +46,7 @@
346 def multiply_tests_by_their_scenarios(some_tests, into_suite):
347 """Multiply the tests in the given suite by their declared scenarios.
348
349- Each test must have a 'scenarios' attribute which is a list of
350+ Each test must have a 'scenarios' attribute which is a list of
351 (name, params) pairs.
352
353 :param some_tests: TestSuite or Test.
354
355=== modified file 'breezy/tests/script.py'
356--- breezy/tests/script.py 2018-11-11 04:08:32 +0000
357+++ breezy/tests/script.py 2018-11-20 21:26:00 +0000
358@@ -142,7 +142,7 @@
359
360 :param args: The command line arguments
361
362- :return: A tuple containing:
363+ :return: A tuple containing:
364 - The file name redirected from or None
365 - The file name redirected to or None
366 - The mode to open the output file or None
367
368=== modified file 'breezy/tests/test_gpg.py'
369--- breezy/tests/test_gpg.py 2018-11-11 04:08:32 +0000
370+++ breezy/tests/test_gpg.py 2018-11-20 21:26:00 +0000
371@@ -342,13 +342,13 @@
372 self.import_keys()
373 content = b"""-----BEGIN PGP SIGNED MESSAGE-----
374 Hash: SHA1
375-
376+
377 bazaar-ng testament short form 1
378 revision-id: test@example.com-20110801100657-f1dr1nompeex723z
379 sha1: 59ab434be4c2d5d646dee84f514aa09e1b72feeb
380 -----BEGIN PGP SIGNATURE-----
381 Version: GnuPG v1.4.10 (GNU/Linux)
382-
383+
384 iJwEAQECAAYFAk42esUACgkQHOJve0+NFRPc5wP7BoZkzBU8JaHMLv/LmqLr0sUz
385 zuE51ofZZ19L7KVtQWsOi4jFy0fi4A5TFwO8u9SOfoREGvkw292Uty9subSouK5/
386 mFmDOYPQ+O83zWgYZsBmMJWYDZ+X9I6XXZSbPtV/7XyTjaxtl5uRnDVJjg+AzKvD
387
388=== modified file 'breezy/tests/test_help.py'
389--- breezy/tests/test_help.py 2018-11-11 04:08:32 +0000
390+++ breezy/tests/test_help.py 2018-11-20 21:26:00 +0000
391@@ -204,12 +204,12 @@
392 """Concise help text excludes the descriptive sections."""
393 class cmd_Demo(commands.Command):
394 __doc__ = """A sample command.
395-
396+
397 Blah blah blah.
398
399 :Examples:
400 Example 1::
401-
402+
403 cmd arg1
404 """
405 cmd = cmd_Demo()
406@@ -429,7 +429,7 @@
407 # The help formatter expect the class name to start with 'cmd_'
408 class cmd_Demo(commands.Command):
409 __doc__ = """A sample command.
410-
411+
412 Blah blah blah.
413
414 :Formats:
415@@ -437,7 +437,7 @@
416
417 :Examples:
418 Example 1::
419-
420+
421 cmd arg1
422
423 :Tips:
424@@ -455,18 +455,18 @@
425 }}
426 Description:
427 zz{{zz{{Blah blah blah.}}
428-
429+
430 }}:Formats:
431 zz{{Interesting stuff about formats.}}
432-
433+
434 Examples:
435 zz{{Example 1::}}
436-
437+
438 zz{{cmd arg1}}
439-
440+
441 Tips:
442 zz{{Clever things to keep in mind.}}
443-
444+
445 ''',
446 cmd_Demo())
447
448
449=== modified file 'breezy/tests/test_script.py'
450--- breezy/tests/test_script.py 2018-11-11 04:08:32 +0000
451+++ breezy/tests/test_script.py 2018-11-20 21:26:00 +0000
452@@ -44,8 +44,8 @@
453 def test_trim_blank_lines(self):
454 """Blank lines are respected, but trimmed at the start and end.
455
456- Python triple-quoted syntax is going to give stubby/empty blank lines
457- right at the start and the end. These are cut off so that callers don't
458+ Python triple-quoted syntax is going to give stubby/empty blank lines
459+ right at the start and the end. These are cut off so that callers don't
460 need special syntax to avoid them.
461
462 However we do want to be able to match commands that emit blank lines.
463@@ -186,7 +186,7 @@
464 """)
465
466 def test_null_output_matches_option(self):
467- """If you want null output to be a wild card, you can pass
468+ """If you want null output to be a wild card, you can pass
469 null_output_matches_anything to run_script"""
470 self.run_script(
471 """
472@@ -628,12 +628,11 @@
473
474 def test_dont_shelve(self):
475 # We intentionally provide no input here to test EOF
476- self.run_script("""
477- $ brz shelve -m 'shelve bar'
478- 2>Shelve? ([y]es, [N]o, [f]inish, [q]uit):
479- 2>No changes to shelve.
480- """,
481- null_output_matches_anything=True)
482+ self.run_script((
483+ "$ brz shelve -m 'shelve bar'\n"
484+ "2>Shelve? ([y]es, [N]o, [f]inish, [q]uit): \n"
485+ "2>No changes to shelve.\n"
486+ ), null_output_matches_anything=True)
487 self.run_script("""
488 $ brz st
489 modified:
490
491=== modified file 'breezy/transform.py'
492--- breezy/transform.py 2018-11-16 23:21:31 +0000
493+++ breezy/transform.py 2018-11-20 21:26:00 +0000
494@@ -604,7 +604,7 @@
495
496 :param name: The basename of the file.
497
498- :param target_id: The directory trans_id where the backup should
499+ :param target_id: The directory trans_id where the backup should
500 be placed.
501 """
502 known_children = self.by_parent().get(target_id, [])
503
504=== modified file 'breezy/transport/__init__.py'
505--- breezy/transport/__init__.py 2018-11-17 16:53:10 +0000
506+++ breezy/transport/__init__.py 2018-11-20 21:26:00 +0000
507@@ -265,7 +265,7 @@
508 def fdatasync(self):
509 """Force data out to physical disk if possible.
510
511- :raises TransportNotPossible: If this transport has no way to
512+ :raises TransportNotPossible: If this transport has no way to
513 flush to disk.
514 """
515 raise errors.TransportNotPossible(
516
517=== modified file 'breezy/transport/log.py'
518--- breezy/transport/log.py 2018-11-11 04:08:32 +0000
519+++ breezy/transport/log.py 2018-11-20 21:26:00 +0000
520@@ -36,7 +36,7 @@
521
522 Not all operations are logged yet.
523
524- See also TransportTraceDecorator, that records a machine-readable log in
525+ See also TransportTraceDecorator, that records a machine-readable log in
526 memory for eg testing.
527 """
528
529
530=== modified file 'breezy/transport/trace.py'
531--- breezy/transport/trace.py 2018-11-11 04:08:32 +0000
532+++ breezy/transport/trace.py 2018-11-20 21:26:00 +0000
533@@ -36,7 +36,7 @@
534 operation please add a test to the tests of this transport, for the logging
535 of the operation you want logged.
536
537- See also TransportLogDecorator, that records a machine-readable log in
538+ See also TransportLogDecorator, that records a machine-readable log in
539 memory for eg testing.
540 """
541
542
543=== modified file 'breezy/tree.py'
544--- breezy/tree.py 2018-11-16 18:40:46 +0000
545+++ breezy/tree.py 2018-11-20 21:26:00 +0000
546@@ -290,7 +290,7 @@
547 :param path: A relative path within the tree.
548 :return: A tuple containing kind, size, exec, sha1-or-link.
549 Kind is always present (see tree.kind()).
550- size is present if kind is file and the size of the
551+ size is present if kind is file and the size of the
552 canonical form can be cheaply determined, None otherwise.
553 exec is None unless kind is file and the platform supports the 'x'
554 bit.
555
556=== modified file 'doc/en/conf.py'
557--- doc/en/conf.py 2018-11-18 02:43:52 +0000
558+++ doc/en/conf.py 2018-11-20 21:26:00 +0000
559@@ -103,4 +103,3 @@
560 # Miscellaneous
561 'user-reference/readme',
562 ]
563-
564
565=== modified file 'profile_imports.py'
566--- profile_imports.py 2018-11-16 18:35:30 +0000
567+++ profile_imports.py 2018-11-20 21:26:00 +0000
568@@ -202,4 +202,3 @@
569 """Remove the import and regex compile timing hooks."""
570 __builtins__['__import__'] = _real_import
571 re._compile = _real_compile
572-
573
574=== modified file 'setup.cfg'
575--- setup.cfg 2018-11-18 20:59:41 +0000
576+++ setup.cfg 2018-11-20 21:26:00 +0000
577@@ -31,10 +31,6 @@
578 F812
579 F821
580 F841
581- W191
582- W291
583- W293
584- W391
585 W503
586 W504
587 W605
588
589=== modified file 'tools/brz_epydoc_uid.py'
590--- tools/brz_epydoc_uid.py 2017-05-21 18:10:28 +0000
591+++ tools/brz_epydoc_uid.py 2018-11-20 21:26:00 +0000
592@@ -40,4 +40,3 @@
593
594
595 _ScopeReplacer._should_proxy = True
596-
597
598=== modified file 'tools/check-newsbugs.py'
599--- tools/check-newsbugs.py 2018-11-16 12:54:47 +0000
600+++ tools/check-newsbugs.py 2018-11-20 21:26:00 +0000
601@@ -1,5 +1,5 @@
602 #!/usr/bin/python
603-# Simple script that will check which bugs mentioned in NEWS
604+# Simple script that will check which bugs mentioned in NEWS
605 # are not yet marked Fix Released in Launchpad
606
607 import getopt, re, sys
608
609=== modified file 'tools/generate_docs.py'
610--- tools/generate_docs.py 2018-11-16 13:15:40 +0000
611+++ tools/generate_docs.py 2018-11-20 21:26:00 +0000
612@@ -25,7 +25,7 @@
613 bash_completion bash completion script
614 ...
615
616-Examples:
617+Examples:
618
619 python generated-docs.py man
620 python generated-docs.py bash_completion
621@@ -99,7 +99,7 @@
622 def print_extended_help(option, opt, value, parser):
623 """ Program help examples
624
625- Prints out the examples stored in the docstring.
626+ Prints out the examples stored in the docstring.
627
628 """
629 sys.stdout.write(__doc__ % {"prog": sys.argv[0]})
630
631=== modified file 'tools/generate_release_notes.py'
632--- tools/generate_release_notes.py 2018-11-18 02:43:52 +0000
633+++ tools/generate_release_notes.py 2018-11-20 21:26:00 +0000
634@@ -58,7 +58,7 @@
635
636 def natural_sort_key(file_name):
637 """Split 'aaa-N.MMbbb' into ('aaa-', N, '.' MM, 'bbb')
638-
639+
640 e.g. 1.10b1 will sort as greater than 1.2::
641
642 >>> natural_sort_key('brz-1.10b1.txt') > natural_sort_key('brz-1.2.txt')
643
644=== modified file 'tools/riodemo.py'
645--- tools/riodemo.py 2018-06-29 15:36:29 +0000
646+++ tools/riodemo.py 2018-11-20 21:26:00 +0000
647@@ -2,12 +2,12 @@
648
649
650 # \subsection{Example usage}
651-#
652-# \textbf{XXX:} Move these to object serialization code.
653+#
654+# \textbf{XXX:} Move these to object serialization code.
655
656 def write_revision(writer, revision):
657 s = Stanza(revision=revision.revision_id,
658- committer=revision.committer,
659+ committer=revision.committer,
660 timezone=long(revision.timezone),
661 timestamp=long(revision.timestamp),
662 inventory_sha1=revision.inventory_sha1,
663
664=== modified file 'tools/rst2html.py'
665--- tools/rst2html.py 2008-07-17 01:08:21 +0000
666+++ tools/rst2html.py 2018-11-20 21:26:00 +0000
667@@ -25,7 +25,7 @@
668 # python-docutils 0.4-4 -- so monkeypatch in a better pattern
669 #
670 # This is a bit gross to patch because all this is built up at load time.
671- Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*'
672+ Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*'
673 Body.pats['longopt'] = r'(--|/)%(optname)s([ =]%(optarg)s)?' % Body.pats
674 Body.pats['option'] = r'(%(shortopt)s|%(longopt)s)' % Body.pats
675 Body.patterns['option_marker'] = r'%(option)s(, %(option)s)*( +| ?$)' % Body.pats
676
677=== modified file 'tools/win32/brz_postinstall.py'
678--- tools/win32/brz_postinstall.py 2018-11-18 12:18:44 +0000
679+++ tools/win32/brz_postinstall.py 2018-11-20 21:26:00 +0000
680@@ -283,7 +283,7 @@
681 f.write(i)
682 else:
683 print('*** Remove line <%s> from autoexec.bat' % pattern)
684-
685+
686 elif add_path and not found:
687 backup_autoexec_bat(abat, abak, dry_run)
688 if not dry_run:

Subscribers

People subscribed via source and target branches