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
=== modified file 'apport/source_brz.py'
--- apport/source_brz.py 2017-07-30 16:59:50 +0000
+++ apport/source_brz.py 2018-11-20 21:26:00 +0000
@@ -24,7 +24,7 @@
24 if line == '\n':24 if line == '\n':
25 blanks += 125 blanks += 1
26 brz_log_tail.append(line)26 brz_log_tail.append(line)
27 if blanks >= 2: 27 if blanks >= 2:
28 break28 break
2929
30 brz_log_tail.reverse()30 brz_log_tail.reverse()
@@ -36,7 +36,7 @@
36 if 'BrzPlugins' not in report:36 if 'BrzPlugins' not in report:
37 # may already be present in-process37 # may already be present in-process
38 report['BrzPlugins'] = command_output(['brz', 'plugins', '-v'])38 report['BrzPlugins'] = command_output(['brz', 'plugins', '-v'])
39 39
40 # by default assume brz crashes are upstream bugs; this relies on40 # by default assume brz crashes are upstream bugs; this relies on
41 # having a brz entry under /etc/apport/crashdb.conf.d/41 # having a brz entry under /etc/apport/crashdb.conf.d/
42 report['CrashDB'] = 'brz'42 report['CrashDB'] = 'brz'
@@ -49,5 +49,5 @@
49 #attach_file_if_exists(report,49 #attach_file_if_exists(report,
50 # os.path.join(dot_brz, 'locations.conf', 'BrzLocations')50 # os.path.join(dot_brz, 'locations.conf', 'BrzLocations')
5151
52 52
53# vim: expandtab shiftwidth=453# vim: expandtab shiftwidth=4
5454
=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py 2018-11-16 18:33:17 +0000
+++ breezy/bzr/bzrdir.py 2018-11-20 21:26:00 +0000
@@ -669,7 +669,7 @@
669669
670 This is true IF and ONLY IF the filename is part of the namespace670 This is true IF and ONLY IF the filename is part of the namespace
671 reserved for bzr control dirs. Currently this is the '.bzr' directory671 reserved for bzr control dirs. Currently this is the '.bzr' directory
672 in the root of the root_transport. 672 in the root of the root_transport.
673 """673 """
674 # this might be better on the BzrDirFormat class because it refers to674 # this might be better on the BzrDirFormat class because it refers to
675 # all the possible bzrdir disk formats.675 # all the possible bzrdir disk formats.
676676
=== modified file 'breezy/bzr/dirstate.py'
--- breezy/bzr/dirstate.py 2018-11-12 01:41:38 +0000
+++ breezy/bzr/dirstate.py 2018-11-20 21:26:00 +0000
@@ -28,7 +28,7 @@
28 WHOLE_NUMBER = {digit}, digit;28 WHOLE_NUMBER = {digit}, digit;
29 BOOLEAN = "y" | "n";29 BOOLEAN = "y" | "n";
30 REVISION_ID = a non-empty utf8 string;30 REVISION_ID = a non-empty utf8 string;
31 31
32 dirstate format = header line, full checksum, row count, parent details,32 dirstate format = header line, full checksum, row count, parent details,
33 ghost_details, entries;33 ghost_details, entries;
34 header line = "#bazaar dirstate flat format 3", NL;34 header line = "#bazaar dirstate flat format 3", NL;
@@ -3578,7 +3578,7 @@
3578 """Compare an entry and real disk to generate delta information.3578 """Compare an entry and real disk to generate delta information.
35793579
3580 :param path_info: top_relpath, basename, kind, lstat, abspath for3580 :param path_info: top_relpath, basename, kind, lstat, abspath for
3581 the path of entry. If None, then the path is considered absent in 3581 the path of entry. If None, then the path is considered absent in
3582 the target (Perhaps we should pass in a concrete entry for this ?)3582 the target (Perhaps we should pass in a concrete entry for this ?)
3583 Basename is returned as a utf8 string because we expect this3583 Basename is returned as a utf8 string because we expect this
3584 tuple will be ignored, and don't want to take the time to3584 tuple will be ignored, and don't want to take the time to
35853585
=== modified file 'breezy/bzr/index.py'
--- breezy/bzr/index.py 2018-11-12 01:41:38 +0000
+++ breezy/bzr/index.py 2018-11-20 21:26:00 +0000
@@ -310,7 +310,7 @@
310 def finish(self):310 def finish(self):
311 """Finish the index.311 """Finish the index.
312312
313 :returns: cBytesIO holding the full context of the index as it 313 :returns: cBytesIO holding the full context of the index as it
314 should be written to disk.314 should be written to disk.
315 """315 """
316 lines = [_SIGNATURE]316 lines = [_SIGNATURE]
317317
=== modified file 'breezy/bzr/inventory.py'
--- breezy/bzr/inventory.py 2018-11-16 11:37:47 +0000
+++ breezy/bzr/inventory.py 2018-11-20 21:26:00 +0000
@@ -1480,7 +1480,7 @@
14801480
1481 if given [foo-id] we will include1481 if given [foo-id] we will include
1482 TREE_ROOT as interesting parents1482 TREE_ROOT as interesting parents
1483 and 1483 and
1484 foo-id, baz-id, frob-id, fringle-id1484 foo-id, baz-id, frob-id, fringle-id
1485 As interesting ids.1485 As interesting ids.
1486 """1486 """
14871487
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py 2018-11-16 18:33:17 +0000
+++ breezy/bzr/workingtree_4.py 2018-11-20 21:26:00 +0000
@@ -1403,7 +1403,7 @@
1403class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):1403class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
1404 """Dirstate working tree that supports content filtering.1404 """Dirstate working tree that supports content filtering.
14051405
1406 The dirstate holds the hash and size of the canonical form of the file, 1406 The dirstate holds the hash and size of the canonical form of the file,
1407 and most methods must return that.1407 and most methods must return that.
1408 """1408 """
14091409
14101410
=== modified file 'breezy/config.py'
--- breezy/config.py 2018-11-16 12:08:41 +0000
+++ breezy/config.py 2018-11-20 21:26:00 +0000
@@ -2105,7 +2105,7 @@
2105 :param override_existing: Raise KeyErorr if False and something has2105 :param override_existing: Raise KeyErorr if False and something has
2106 already been registered for that key. If True, ignore if there2106 already been registered for that key. If True, ignore if there
2107 is an existing key (always register the new value).2107 is an existing key (always register the new value).
2108 :param fallback: Whether this credential store should be 2108 :param fallback: Whether this credential store should be
2109 used as fallback.2109 used as fallback.
2110 """2110 """
2111 return super(CredentialStoreRegistry,2111 return super(CredentialStoreRegistry,
@@ -2125,7 +2125,7 @@
2125 :param override_existing: If True, replace the existing object2125 :param override_existing: If True, replace the existing object
2126 with the new one. If False, if there is already something2126 with the new one. If False, if there is already something
2127 registered with the same key, raise a KeyError2127 registered with the same key, raise a KeyError
2128 :param fallback: Whether this credential store should be 2128 :param fallback: Whether this credential store should be
2129 used as fallback.2129 used as fallback.
2130 """2130 """
2131 return super(CredentialStoreRegistry, self).register_lazy(2131 return super(CredentialStoreRegistry, self).register_lazy(
21322132
=== modified file 'breezy/counted_lock.py'
--- breezy/counted_lock.py 2018-11-11 04:08:32 +0000
+++ breezy/counted_lock.py 2018-11-20 21:26:00 +0000
@@ -29,7 +29,7 @@
29 This can be used with any object that provides a basic Lock interface,29 This can be used with any object that provides a basic Lock interface,
30 including LockDirs and OS file locks.30 including LockDirs and OS file locks.
3131
32 :ivar _token: While a write lock is held, this is the token 32 :ivar _token: While a write lock is held, this is the token
33 for it.33 for it.
34 """34 """
3535
@@ -81,7 +81,7 @@
8181
82 If the lock was originally acquired in read mode this will fail.82 If the lock was originally acquired in read mode this will fail.
8383
84 :param token: If given and the lock is already held, 84 :param token: If given and the lock is already held,
85 then validate that we already hold the real85 then validate that we already hold the real
86 lock with this token.86 lock with this token.
8787
8888
=== modified file 'breezy/diff.py'
--- breezy/diff.py 2018-11-16 18:33:17 +0000
+++ breezy/diff.py 2018-11-20 21:26:00 +0000
@@ -447,10 +447,10 @@
447 :param to_file: The output stream.447 :param to_file: The output stream.
448 :param specific_files: Include only changes to these files - None for all448 :param specific_files: Include only changes to these files - None for all
449 changes.449 changes.
450 :param external_diff_options: If set, use an external GNU diff and pass 450 :param external_diff_options: If set, use an external GNU diff and pass
451 these options.451 these options.
452 :param extra_trees: If set, more Trees to use for looking up file ids452 :param extra_trees: If set, more Trees to use for looking up file ids
453 :param path_encoding: If set, the path will be encoded as specified, 453 :param path_encoding: If set, the path will be encoded as specified,
454 otherwise is supposed to be utf8454 otherwise is supposed to be utf8
455 :param format_cls: Formatter class (DiffTree subclass)455 :param format_cls: Formatter class (DiffTree subclass)
456 """456 """
457457
=== modified file 'breezy/foreign.py'
--- breezy/foreign.py 2018-11-16 12:08:41 +0000
+++ breezy/foreign.py 2018-11-20 21:26:00 +0000
@@ -145,7 +145,7 @@
145 """Serialize a foreign revision id for this VCS.145 """Serialize a foreign revision id for this VCS.
146146
147 :param foreign_revid: Foreign revision id147 :param foreign_revid: Foreign revision id
148 :return: Bytestring with serialized revid, will not contain any 148 :return: Bytestring with serialized revid, will not contain any
149 newlines.149 newlines.
150 """150 """
151 raise NotImplementedError(self.serialize_foreign_revid)151 raise NotImplementedError(self.serialize_foreign_revid)
152152
=== modified file 'breezy/globbing.py'
--- breezy/globbing.py 2018-11-12 01:41:38 +0000
+++ breezy/globbing.py 2018-11-20 21:26:00 +0000
@@ -297,9 +297,9 @@
297 """A Globster that supports exception patterns.297 """A Globster that supports exception patterns.
298298
299 Exceptions are ignore patterns prefixed with '!'. Exception299 Exceptions are ignore patterns prefixed with '!'. Exception
300 patterns take precedence over regular patterns and cause a 300 patterns take precedence over regular patterns and cause a
301 matching filename to return None from the match() function. 301 matching filename to return None from the match() function.
302 Patterns using a '!!' prefix are highest precedence, and act 302 Patterns using a '!!' prefix are highest precedence, and act
303 as regular ignores. '!!' patterns are useful to establish ignores303 as regular ignores. '!!' patterns are useful to establish ignores
304 that apply under paths specified by '!' exception patterns.304 that apply under paths specified by '!' exception patterns.
305 """305 """
306306
=== modified file 'breezy/help_topics/__init__.py'
--- breezy/help_topics/__init__.py 2018-11-11 04:08:32 +0000
+++ breezy/help_topics/__init__.py 2018-11-20 21:26:00 +0000
@@ -526,10 +526,10 @@
526repository (a shared repository). Branches can be copied and merged.526repository (a shared repository). Branches can be copied and merged.
527527
528In addition, one branch may be bound to another one. Binding to another528In addition, one branch may be bound to another one. Binding to another
529branch indicates that commits which happen in this branch must also 529branch indicates that commits which happen in this branch must also
530happen in the other branch. Breezy ensures consistency by not allowing 530happen in the other branch. Breezy ensures consistency by not allowing
531commits when the two branches are out of date. In order for a commit 531commits when the two branches are out of date. In order for a commit
532to succeed, it may be necessary to update the current branch using 532to succeed, it may be necessary to update the current branch using
533``brz update``.533``brz update``.
534534
535Related commands::535Related commands::
536536
=== modified file 'breezy/plugins/bash_completion/bashcomp.py'
--- breezy/plugins/bash_completion/bashcomp.py 2018-11-16 11:54:55 +0000
+++ breezy/plugins/bash_completion/bashcomp.py 2018-11-20 21:26:00 +0000
@@ -422,7 +422,7 @@
422 This command generates a shell function which can be used by bash to422 This command generates a shell function which can be used by bash to
423 automatically complete the currently typed command when the user presses423 automatically complete the currently typed command when the user presses
424 the completion key (usually tab).424 the completion key (usually tab).
425 425
426 Commonly used like this:426 Commonly used like this:
427 eval "`brz bash-completion`"427 eval "`brz bash-completion`"
428 """428 """
429429
=== modified file 'breezy/plugins/fastimport/cmds.py'
--- breezy/plugins/fastimport/cmds.py 2018-11-11 04:08:32 +0000
+++ breezy/plugins/fastimport/cmds.py 2018-11-20 21:26:00 +0000
@@ -85,7 +85,7 @@
85 bzr fast-import project.fi project.bzr85 bzr fast-import project.fi project.bzr
8686
87 Numerous commands are provided for generating a fast-import file87 Numerous commands are provided for generating a fast-import file
88 to use as input. 88 to use as input.
89 To specify standard input as the input stream, use a89 To specify standard input as the input stream, use a
90 source name of '-' (instead of project.fi). If the source name90 source name of '-' (instead of project.fi). If the source name
91 ends in '.gz', it is assumed to be compressed in gzip format.91 ends in '.gz', it is assumed to be compressed in gzip format.
9292
=== modified file 'breezy/plugins/launchpad/__init__.py'
--- breezy/plugins/launchpad/__init__.py 2018-11-11 04:08:32 +0000
+++ breezy/plugins/launchpad/__init__.py 2018-11-20 21:26:00 +0000
@@ -17,7 +17,7 @@
17"""Launchpad.net integration plugin for Bazaar.17"""Launchpad.net integration plugin for Bazaar.
1818
19This plugin provides facilities for working with Bazaar branches that are19This plugin provides facilities for working with Bazaar branches that are
20hosted on Launchpad (http://launchpad.net). It provides a directory service 20hosted on Launchpad (http://launchpad.net). It provides a directory service
21for referring to Launchpad branches using the "lp:" prefix. For example,21for referring to Launchpad branches using the "lp:" prefix. For example,
22lp:bzr refers to the Bazaar's main development branch and22lp:bzr refers to the Bazaar's main development branch and
23lp:~username/project/branch-name can be used to refer to a specific branch.23lp:~username/project/branch-name can be used to refer to a specific branch.
2424
=== modified file 'breezy/plugins/upload/__init__.py'
--- breezy/plugins/upload/__init__.py 2018-11-11 04:08:32 +0000
+++ breezy/plugins/upload/__init__.py 2018-11-20 21:26:00 +0000
@@ -32,7 +32,7 @@
3232
33 brz upload -r X sftp://user@host/location/on/webserver33 brz upload -r X sftp://user@host/location/on/webserver
3434
35bzr-upload, just as brz does, will remember the location where you upload the 35bzr-upload, just as brz does, will remember the location where you upload the
36first time, so you don't need to specify it every time.36first time, so you don't need to specify it every time.
3737
38If you need to re-upload the whole working tree for some reason, you can:38If you need to re-upload the whole working tree for some reason, you can:
@@ -107,7 +107,7 @@
107It is possible to upload to a remote location from another remote location by107It is possible to upload to a remote location from another remote location by
108specifying it with the --directory option:108specifying it with the --directory option:
109109
110 brz upload sftp://public.example.com --directory sftp://private.example.com 110 brz upload sftp://public.example.com --directory sftp://private.example.com
111111
112This, together with --auto, can be used to upload when you push to your112This, together with --auto, can be used to upload when you push to your
113central branch, rather than when you commit to your local branch.113central branch, rather than when you commit to your local branch.
114114
=== modified file 'breezy/repository.py'
--- breezy/repository.py 2018-11-11 04:08:32 +0000
+++ breezy/repository.py 2018-11-20 21:26:00 +0000
@@ -1144,7 +1144,7 @@
1144 :param callback_refs: A dict of check-refs to resolve and callback1144 :param callback_refs: A dict of check-refs to resolve and callback
1145 the check/_check method on the items listed as wanting the ref.1145 the check/_check method on the items listed as wanting the ref.
1146 see breezy.check.1146 see breezy.check.
1147 :param check_repo: If False do not check the repository contents, just 1147 :param check_repo: If False do not check the repository contents, just
1148 calculate the data callback_refs requires and call them back.1148 calculate the data callback_refs requires and call them back.
1149 """1149 """
1150 return self._check(revision_ids=revision_ids, callback_refs=callback_refs,1150 return self._check(revision_ids=revision_ids, callback_refs=callback_refs,
11511151
=== modified file 'breezy/tests/blackbox/test_uncommit.py'
--- breezy/tests/blackbox/test_uncommit.py 2018-07-17 21:50:43 +0000
+++ breezy/tests/blackbox/test_uncommit.py 2018-11-20 21:26:00 +0000
@@ -237,7 +237,7 @@
237 script = ScriptRunner()237 script = ScriptRunner()
238 script.run_script(self, """238 script.run_script(self, """
239$ cd tree239$ cd tree
240$ brz uncommit --force 240$ brz uncommit --force
241 2 ...241 2 ...
242 second commit242 second commit
243...243...
244244
=== modified file 'breezy/tests/per_controldir_colo/__init__.py'
--- breezy/tests/per_controldir_colo/__init__.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/per_controldir_colo/__init__.py 2018-11-20 21:26:00 +0000
@@ -18,7 +18,7 @@
18"""BzrDir implementation tests for colocated branch support.18"""BzrDir implementation tests for colocated branch support.
1919
20These tests check the conformance of the colocated branches support.20These tests check the conformance of the colocated branches support.
21All bzrdir formats are tested - those that do not suppport colocated branches 21All bzrdir formats are tested - those that do not suppport colocated branches
22have the test_unsupported tests run; the others have the test_supported tests22have the test_unsupported tests run; the others have the test_supported tests
23run.23run.
24"""24"""
2525
=== modified file 'breezy/tests/per_controldir_colo/test_unsupported.py'
--- breezy/tests/per_controldir_colo/test_unsupported.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/per_controldir_colo/test_unsupported.py 2018-11-20 21:26:00 +0000
@@ -16,7 +16,7 @@
1616
17"""Tests for bazaar control directories that do not support colocated branches.17"""Tests for bazaar control directories that do not support colocated branches.
1818
19Colocated branch support is optional, and when it is not supported the methods 19Colocated branch support is optional, and when it is not supported the methods
20and attributes colocated branch support added should fail in known ways.20and attributes colocated branch support added should fail in known ways.
21"""21"""
2222
2323
=== modified file 'breezy/tests/per_foreign_vcs/test_branch.py'
--- breezy/tests/per_foreign_vcs/test_branch.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/per_foreign_vcs/test_branch.py 2018-11-20 21:26:00 +0000
@@ -49,8 +49,8 @@
49class ForeignBranchTests(TestCaseWithTransport):49class ForeignBranchTests(TestCaseWithTransport):
50 """Basic tests for foreign branch implementations.50 """Basic tests for foreign branch implementations.
5151
52 These tests mainly make sure that the implementation covers the required 52 These tests mainly make sure that the implementation covers the required
53 bits of the API and returns reasonable values. 53 bits of the API and returns reasonable values.
54 """54 """
55 branch_factory = None # Set to an instance of ForeignBranchFactory by scenario55 branch_factory = None # Set to an instance of ForeignBranchFactory by scenario
5656
5757
=== modified file 'breezy/tests/scenarios.py'
--- breezy/tests/scenarios.py 2017-05-23 14:08:03 +0000
+++ breezy/tests/scenarios.py 2018-11-20 21:26:00 +0000
@@ -46,7 +46,7 @@
46def multiply_tests_by_their_scenarios(some_tests, into_suite):46def multiply_tests_by_their_scenarios(some_tests, into_suite):
47 """Multiply the tests in the given suite by their declared scenarios.47 """Multiply the tests in the given suite by their declared scenarios.
4848
49 Each test must have a 'scenarios' attribute which is a list of 49 Each test must have a 'scenarios' attribute which is a list of
50 (name, params) pairs.50 (name, params) pairs.
5151
52 :param some_tests: TestSuite or Test.52 :param some_tests: TestSuite or Test.
5353
=== modified file 'breezy/tests/script.py'
--- breezy/tests/script.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/script.py 2018-11-20 21:26:00 +0000
@@ -142,7 +142,7 @@
142142
143 :param args: The command line arguments143 :param args: The command line arguments
144144
145 :return: A tuple containing: 145 :return: A tuple containing:
146 - The file name redirected from or None146 - The file name redirected from or None
147 - The file name redirected to or None147 - The file name redirected to or None
148 - The mode to open the output file or None148 - The mode to open the output file or None
149149
=== modified file 'breezy/tests/test_gpg.py'
--- breezy/tests/test_gpg.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/test_gpg.py 2018-11-20 21:26:00 +0000
@@ -342,13 +342,13 @@
342 self.import_keys()342 self.import_keys()
343 content = b"""-----BEGIN PGP SIGNED MESSAGE-----343 content = b"""-----BEGIN PGP SIGNED MESSAGE-----
344Hash: SHA1344Hash: SHA1
345 345
346bazaar-ng testament short form 1346bazaar-ng testament short form 1
347revision-id: test@example.com-20110801100657-f1dr1nompeex723z347revision-id: test@example.com-20110801100657-f1dr1nompeex723z
348sha1: 59ab434be4c2d5d646dee84f514aa09e1b72feeb348sha1: 59ab434be4c2d5d646dee84f514aa09e1b72feeb
349-----BEGIN PGP SIGNATURE-----349-----BEGIN PGP SIGNATURE-----
350Version: GnuPG v1.4.10 (GNU/Linux)350Version: GnuPG v1.4.10 (GNU/Linux)
351 351
352iJwEAQECAAYFAk42esUACgkQHOJve0+NFRPc5wP7BoZkzBU8JaHMLv/LmqLr0sUz352iJwEAQECAAYFAk42esUACgkQHOJve0+NFRPc5wP7BoZkzBU8JaHMLv/LmqLr0sUz
353zuE51ofZZ19L7KVtQWsOi4jFy0fi4A5TFwO8u9SOfoREGvkw292Uty9subSouK5/353zuE51ofZZ19L7KVtQWsOi4jFy0fi4A5TFwO8u9SOfoREGvkw292Uty9subSouK5/
354mFmDOYPQ+O83zWgYZsBmMJWYDZ+X9I6XXZSbPtV/7XyTjaxtl5uRnDVJjg+AzKvD354mFmDOYPQ+O83zWgYZsBmMJWYDZ+X9I6XXZSbPtV/7XyTjaxtl5uRnDVJjg+AzKvD
355355
=== modified file 'breezy/tests/test_help.py'
--- breezy/tests/test_help.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/test_help.py 2018-11-20 21:26:00 +0000
@@ -204,12 +204,12 @@
204 """Concise help text excludes the descriptive sections."""204 """Concise help text excludes the descriptive sections."""
205 class cmd_Demo(commands.Command):205 class cmd_Demo(commands.Command):
206 __doc__ = """A sample command.206 __doc__ = """A sample command.
207 207
208 Blah blah blah.208 Blah blah blah.
209209
210 :Examples:210 :Examples:
211 Example 1::211 Example 1::
212 212
213 cmd arg1213 cmd arg1
214 """214 """
215 cmd = cmd_Demo()215 cmd = cmd_Demo()
@@ -429,7 +429,7 @@
429 # The help formatter expect the class name to start with 'cmd_'429 # The help formatter expect the class name to start with 'cmd_'
430 class cmd_Demo(commands.Command):430 class cmd_Demo(commands.Command):
431 __doc__ = """A sample command.431 __doc__ = """A sample command.
432 432
433 Blah blah blah.433 Blah blah blah.
434434
435 :Formats:435 :Formats:
@@ -437,7 +437,7 @@
437437
438 :Examples:438 :Examples:
439 Example 1::439 Example 1::
440 440
441 cmd arg1441 cmd arg1
442442
443 :Tips:443 :Tips:
@@ -455,18 +455,18 @@
455}}455}}
456Description:456Description:
457 zz{{zz{{Blah blah blah.}}457 zz{{zz{{Blah blah blah.}}
458 458
459}}:Formats:459}}:Formats:
460 zz{{Interesting stuff about formats.}}460 zz{{Interesting stuff about formats.}}
461 461
462Examples:462Examples:
463 zz{{Example 1::}}463 zz{{Example 1::}}
464 464
465 zz{{cmd arg1}}465 zz{{cmd arg1}}
466 466
467Tips:467Tips:
468 zz{{Clever things to keep in mind.}}468 zz{{Clever things to keep in mind.}}
469 469
470''',470''',
471 cmd_Demo())471 cmd_Demo())
472472
473473
=== modified file 'breezy/tests/test_script.py'
--- breezy/tests/test_script.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/test_script.py 2018-11-20 21:26:00 +0000
@@ -44,8 +44,8 @@
44 def test_trim_blank_lines(self):44 def test_trim_blank_lines(self):
45 """Blank lines are respected, but trimmed at the start and end.45 """Blank lines are respected, but trimmed at the start and end.
4646
47 Python triple-quoted syntax is going to give stubby/empty blank lines 47 Python triple-quoted syntax is going to give stubby/empty blank lines
48 right at the start and the end. These are cut off so that callers don't 48 right at the start and the end. These are cut off so that callers don't
49 need special syntax to avoid them.49 need special syntax to avoid them.
5050
51 However we do want to be able to match commands that emit blank lines.51 However we do want to be able to match commands that emit blank lines.
@@ -186,7 +186,7 @@
186 """)186 """)
187187
188 def test_null_output_matches_option(self):188 def test_null_output_matches_option(self):
189 """If you want null output to be a wild card, you can pass 189 """If you want null output to be a wild card, you can pass
190 null_output_matches_anything to run_script"""190 null_output_matches_anything to run_script"""
191 self.run_script(191 self.run_script(
192 """192 """
@@ -628,12 +628,11 @@
628628
629 def test_dont_shelve(self):629 def test_dont_shelve(self):
630 # We intentionally provide no input here to test EOF630 # We intentionally provide no input here to test EOF
631 self.run_script("""631 self.run_script((
632 $ brz shelve -m 'shelve bar'632 "$ brz shelve -m 'shelve bar'\n"
633 2>Shelve? ([y]es, [N]o, [f]inish, [q]uit): 633 "2>Shelve? ([y]es, [N]o, [f]inish, [q]uit): \n"
634 2>No changes to shelve.634 "2>No changes to shelve.\n"
635 """,635 ), null_output_matches_anything=True)
636 null_output_matches_anything=True)
637 self.run_script("""636 self.run_script("""
638 $ brz st637 $ brz st
639 modified:638 modified:
640639
=== modified file 'breezy/transform.py'
--- breezy/transform.py 2018-11-16 23:21:31 +0000
+++ breezy/transform.py 2018-11-20 21:26:00 +0000
@@ -604,7 +604,7 @@
604604
605 :param name: The basename of the file.605 :param name: The basename of the file.
606606
607 :param target_id: The directory trans_id where the backup should 607 :param target_id: The directory trans_id where the backup should
608 be placed.608 be placed.
609 """609 """
610 known_children = self.by_parent().get(target_id, [])610 known_children = self.by_parent().get(target_id, [])
611611
=== modified file 'breezy/transport/__init__.py'
--- breezy/transport/__init__.py 2018-11-17 16:53:10 +0000
+++ breezy/transport/__init__.py 2018-11-20 21:26:00 +0000
@@ -265,7 +265,7 @@
265 def fdatasync(self):265 def fdatasync(self):
266 """Force data out to physical disk if possible.266 """Force data out to physical disk if possible.
267267
268 :raises TransportNotPossible: If this transport has no way to 268 :raises TransportNotPossible: If this transport has no way to
269 flush to disk.269 flush to disk.
270 """270 """
271 raise errors.TransportNotPossible(271 raise errors.TransportNotPossible(
272272
=== modified file 'breezy/transport/log.py'
--- breezy/transport/log.py 2018-11-11 04:08:32 +0000
+++ breezy/transport/log.py 2018-11-20 21:26:00 +0000
@@ -36,7 +36,7 @@
3636
37 Not all operations are logged yet.37 Not all operations are logged yet.
3838
39 See also TransportTraceDecorator, that records a machine-readable log in 39 See also TransportTraceDecorator, that records a machine-readable log in
40 memory for eg testing.40 memory for eg testing.
41 """41 """
4242
4343
=== modified file 'breezy/transport/trace.py'
--- breezy/transport/trace.py 2018-11-11 04:08:32 +0000
+++ breezy/transport/trace.py 2018-11-20 21:26:00 +0000
@@ -36,7 +36,7 @@
36 operation please add a test to the tests of this transport, for the logging36 operation please add a test to the tests of this transport, for the logging
37 of the operation you want logged.37 of the operation you want logged.
3838
39 See also TransportLogDecorator, that records a machine-readable log in 39 See also TransportLogDecorator, that records a machine-readable log in
40 memory for eg testing.40 memory for eg testing.
41 """41 """
4242
4343
=== modified file 'breezy/tree.py'
--- breezy/tree.py 2018-11-16 18:40:46 +0000
+++ breezy/tree.py 2018-11-20 21:26:00 +0000
@@ -290,7 +290,7 @@
290 :param path: A relative path within the tree.290 :param path: A relative path within the tree.
291 :return: A tuple containing kind, size, exec, sha1-or-link.291 :return: A tuple containing kind, size, exec, sha1-or-link.
292 Kind is always present (see tree.kind()).292 Kind is always present (see tree.kind()).
293 size is present if kind is file and the size of the 293 size is present if kind is file and the size of the
294 canonical form can be cheaply determined, None otherwise.294 canonical form can be cheaply determined, None otherwise.
295 exec is None unless kind is file and the platform supports the 'x'295 exec is None unless kind is file and the platform supports the 'x'
296 bit.296 bit.
297297
=== modified file 'doc/en/conf.py'
--- doc/en/conf.py 2018-11-18 02:43:52 +0000
+++ doc/en/conf.py 2018-11-20 21:26:00 +0000
@@ -103,4 +103,3 @@
103 # Miscellaneous103 # Miscellaneous
104 'user-reference/readme',104 'user-reference/readme',
105]105]
106
107106
=== modified file 'profile_imports.py'
--- profile_imports.py 2018-11-16 18:35:30 +0000
+++ profile_imports.py 2018-11-20 21:26:00 +0000
@@ -202,4 +202,3 @@
202 """Remove the import and regex compile timing hooks."""202 """Remove the import and regex compile timing hooks."""
203 __builtins__['__import__'] = _real_import203 __builtins__['__import__'] = _real_import
204 re._compile = _real_compile204 re._compile = _real_compile
205
206205
=== modified file 'setup.cfg'
--- setup.cfg 2018-11-18 20:59:41 +0000
+++ setup.cfg 2018-11-20 21:26:00 +0000
@@ -31,10 +31,6 @@
31 F81231 F812
32 F82132 F821
33 F84133 F841
34 W191
35 W291
36 W293
37 W391
38 W50334 W503
39 W50435 W504
40 W60536 W605
4137
=== modified file 'tools/brz_epydoc_uid.py'
--- tools/brz_epydoc_uid.py 2017-05-21 18:10:28 +0000
+++ tools/brz_epydoc_uid.py 2018-11-20 21:26:00 +0000
@@ -40,4 +40,3 @@
4040
4141
42_ScopeReplacer._should_proxy = True42_ScopeReplacer._should_proxy = True
43
4443
=== modified file 'tools/check-newsbugs.py'
--- tools/check-newsbugs.py 2018-11-16 12:54:47 +0000
+++ tools/check-newsbugs.py 2018-11-20 21:26:00 +0000
@@ -1,5 +1,5 @@
1#!/usr/bin/python1#!/usr/bin/python
2# Simple script that will check which bugs mentioned in NEWS 2# Simple script that will check which bugs mentioned in NEWS
3# are not yet marked Fix Released in Launchpad3# are not yet marked Fix Released in Launchpad
44
5import getopt, re, sys5import getopt, re, sys
66
=== modified file 'tools/generate_docs.py'
--- tools/generate_docs.py 2018-11-16 13:15:40 +0000
+++ tools/generate_docs.py 2018-11-20 21:26:00 +0000
@@ -25,7 +25,7 @@
25 bash_completion bash completion script25 bash_completion bash completion script
26 ...26 ...
2727
28Examples: 28Examples:
2929
30 python generated-docs.py man30 python generated-docs.py man
31 python generated-docs.py bash_completion31 python generated-docs.py bash_completion
@@ -99,7 +99,7 @@
99def print_extended_help(option, opt, value, parser):99def print_extended_help(option, opt, value, parser):
100 """ Program help examples100 """ Program help examples
101101
102 Prints out the examples stored in the docstring. 102 Prints out the examples stored in the docstring.
103103
104 """104 """
105 sys.stdout.write(__doc__ % {"prog": sys.argv[0]})105 sys.stdout.write(__doc__ % {"prog": sys.argv[0]})
106106
=== modified file 'tools/generate_release_notes.py'
--- tools/generate_release_notes.py 2018-11-18 02:43:52 +0000
+++ tools/generate_release_notes.py 2018-11-20 21:26:00 +0000
@@ -58,7 +58,7 @@
5858
59def natural_sort_key(file_name):59def natural_sort_key(file_name):
60 """Split 'aaa-N.MMbbb' into ('aaa-', N, '.' MM, 'bbb')60 """Split 'aaa-N.MMbbb' into ('aaa-', N, '.' MM, 'bbb')
61 61
62 e.g. 1.10b1 will sort as greater than 1.2::62 e.g. 1.10b1 will sort as greater than 1.2::
6363
64 >>> natural_sort_key('brz-1.10b1.txt') > natural_sort_key('brz-1.2.txt')64 >>> natural_sort_key('brz-1.10b1.txt') > natural_sort_key('brz-1.2.txt')
6565
=== modified file 'tools/riodemo.py'
--- tools/riodemo.py 2018-06-29 15:36:29 +0000
+++ tools/riodemo.py 2018-11-20 21:26:00 +0000
@@ -2,12 +2,12 @@
22
33
4# \subsection{Example usage}4# \subsection{Example usage}
5# 5#
6# \textbf{XXX:} Move these to object serialization code. 6# \textbf{XXX:} Move these to object serialization code.
77
8def write_revision(writer, revision):8def write_revision(writer, revision):
9 s = Stanza(revision=revision.revision_id,9 s = Stanza(revision=revision.revision_id,
10 committer=revision.committer, 10 committer=revision.committer,
11 timezone=long(revision.timezone),11 timezone=long(revision.timezone),
12 timestamp=long(revision.timestamp),12 timestamp=long(revision.timestamp),
13 inventory_sha1=revision.inventory_sha1,13 inventory_sha1=revision.inventory_sha1,
1414
=== modified file 'tools/rst2html.py'
--- tools/rst2html.py 2008-07-17 01:08:21 +0000
+++ tools/rst2html.py 2018-11-20 21:26:00 +0000
@@ -25,7 +25,7 @@
25 # python-docutils 0.4-4 -- so monkeypatch in a better pattern25 # python-docutils 0.4-4 -- so monkeypatch in a better pattern
26 #26 #
27 # This is a bit gross to patch because all this is built up at load time.27 # This is a bit gross to patch because all this is built up at load time.
28 Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*' 28 Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*'
29 Body.pats['longopt'] = r'(--|/)%(optname)s([ =]%(optarg)s)?' % Body.pats29 Body.pats['longopt'] = r'(--|/)%(optname)s([ =]%(optarg)s)?' % Body.pats
30 Body.pats['option'] = r'(%(shortopt)s|%(longopt)s)' % Body.pats30 Body.pats['option'] = r'(%(shortopt)s|%(longopt)s)' % Body.pats
31 Body.patterns['option_marker'] = r'%(option)s(, %(option)s)*( +| ?$)' % Body.pats31 Body.patterns['option_marker'] = r'%(option)s(, %(option)s)*( +| ?$)' % Body.pats
3232
=== modified file 'tools/win32/brz_postinstall.py'
--- tools/win32/brz_postinstall.py 2018-11-18 12:18:44 +0000
+++ tools/win32/brz_postinstall.py 2018-11-20 21:26:00 +0000
@@ -283,7 +283,7 @@
283 f.write(i)283 f.write(i)
284 else:284 else:
285 print('*** Remove line <%s> from autoexec.bat' % pattern)285 print('*** Remove line <%s> from autoexec.bat' % pattern)
286 286
287 elif add_path and not found:287 elif add_path and not found:
288 backup_autoexec_bat(abat, abak, dry_run)288 backup_autoexec_bat(abat, abak, dry_run)
289 if not dry_run:289 if not dry_run:

Subscribers

People subscribed via source and target branches