Merge lp:~jelmer/brz/drop-future into lp:brz
- drop-future
- Merge into trunk
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | no longer in the source branch. |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~jelmer/brz/drop-future |
Merge into: | lp:brz |
Diff against target: |
5748 lines (+1/-902) 441 files modified
breezy/__init__.py (+1/-3) breezy/_annotator_py.py (+0/-2) breezy/_annotator_pyx.pyx (+0/-2) breezy/_bencode_pyx.pyx (+0/-2) breezy/_chunks_to_lines_py.py (+0/-2) breezy/_chunks_to_lines_pyx.pyx (+0/-2) breezy/_known_graph_py.py (+0/-2) breezy/_known_graph_pyx.pyx (+0/-2) breezy/_readdir_py.py (+0/-2) breezy/_readdir_pyx.pyx (+0/-2) breezy/_rio_py.py (+0/-2) breezy/_rio_pyx.pyx (+0/-2) breezy/_simple_set_pyx.pyx (+0/-2) breezy/_static_tuple_py.py (+0/-2) breezy/_termcolor.py (+0/-2) breezy/_walkdirs_win32.pyx (+0/-2) breezy/add.py (+0/-2) breezy/annotate.py (+0/-2) breezy/archive/__init__.py (+0/-2) breezy/archive/tar.py (+0/-2) breezy/archive/zip.py (+0/-2) breezy/atomicfile.py (+0/-2) breezy/bedding.py (+0/-2) breezy/bencode.py (+0/-2) breezy/bisect.py (+0/-2) breezy/bisect_multi.py (+0/-2) breezy/branch.py (+0/-2) breezy/branchbuilder.py (+0/-2) breezy/breakin.py (+0/-2) breezy/bugtracker.py (+0/-2) breezy/builtins.py (+0/-2) breezy/bzr/__init__.py (+0/-2) breezy/bzr/_btree_serializer_py.py (+0/-2) breezy/bzr/_btree_serializer_pyx.pyx (+0/-2) breezy/bzr/_chk_map_py.py (+0/-2) breezy/bzr/_chk_map_pyx.pyx (+0/-2) breezy/bzr/_dirstate_helpers_py.py (+0/-2) breezy/bzr/_dirstate_helpers_pyx.pyx (+0/-2) breezy/bzr/_groupcompress_py.py (+0/-2) breezy/bzr/_groupcompress_pyx.pyx (+0/-2) breezy/bzr/_knit_load_data_py.py (+0/-2) breezy/bzr/_knit_load_data_pyx.pyx (+0/-2) breezy/bzr/_str_helpers.pxd (+0/-2) breezy/bzr/branch.py (+0/-2) breezy/bzr/btree_index.py (+0/-2) breezy/bzr/bundle/__init__.py (+0/-2) breezy/bzr/bundle/apply_bundle.py (+0/-2) breezy/bzr/bundle/bundle_data.py (+0/-2) breezy/bzr/bundle/commands.py (+0/-2) breezy/bzr/bundle/serializer/__init__.py (+0/-2) breezy/bzr/bundle/serializer/v08.py (+0/-2) breezy/bzr/bundle/serializer/v09.py (+0/-2) breezy/bzr/bundle/serializer/v4.py (+0/-2) breezy/bzr/bzrdir.py (+0/-2) breezy/bzr/check.py (+0/-2) breezy/bzr/chk_map.py (+0/-2) breezy/bzr/chk_serializer.py (+0/-2) breezy/bzr/debug_commands.py (+0/-2) breezy/bzr/dirstate.py (+0/-2) breezy/bzr/fetch.py (+0/-2) breezy/bzr/fullhistory.py (+0/-2) breezy/bzr/generate_ids.py (+0/-2) breezy/bzr/groupcompress.py (+0/-2) breezy/bzr/groupcompress_repo.py (+0/-2) breezy/bzr/index.py (+0/-2) breezy/bzr/inventory.py (+0/-2) breezy/bzr/inventory_delta.py (+0/-2) breezy/bzr/inventorytree.py (+0/-2) breezy/bzr/knit.py (+0/-2) breezy/bzr/knitpack_repo.py (+0/-2) breezy/bzr/knitrepo.py (+0/-2) breezy/bzr/pack.py (+0/-2) breezy/bzr/pack_repo.py (+0/-2) breezy/bzr/reconcile.py (+0/-2) breezy/bzr/remote.py (+0/-2) breezy/bzr/repository.py (+0/-2) breezy/bzr/serializer.py (+0/-2) breezy/bzr/smart/__init__.py (+0/-2) breezy/bzr/smart/branch.py (+0/-2) breezy/bzr/smart/bzrdir.py (+0/-2) breezy/bzr/smart/client.py (+0/-2) breezy/bzr/smart/medium.py (+0/-2) breezy/bzr/smart/message.py (+0/-2) breezy/bzr/smart/packrepository.py (+0/-2) breezy/bzr/smart/ping.py (+0/-2) breezy/bzr/smart/protocol.py (+0/-2) breezy/bzr/smart/repository.py (+0/-2) breezy/bzr/smart/request.py (+0/-2) breezy/bzr/smart/server.py (+0/-2) breezy/bzr/smart/signals.py (+0/-2) breezy/bzr/smart/vfs.py (+0/-2) breezy/bzr/testament.py (+0/-2) breezy/bzr/textinv.py (+0/-2) breezy/bzr/versionedfile.py (+0/-2) breezy/bzr/vf_repository.py (+0/-2) breezy/bzr/vf_search.py (+0/-2) breezy/bzr/weave.py (+0/-2) breezy/bzr/weavefile.py (+0/-2) breezy/bzr/workingtree.py (+0/-2) breezy/bzr/workingtree_3.py (+0/-2) breezy/bzr/workingtree_4.py (+0/-2) breezy/bzr/xml5.py (+0/-2) breezy/bzr/xml6.py (+0/-2) breezy/bzr/xml7.py (+0/-2) breezy/bzr/xml8.py (+0/-2) breezy/bzr/xml_serializer.py (+0/-2) breezy/bzr_distutils.py (+0/-2) breezy/cache_utf8.py (+0/-2) breezy/cethread.py (+0/-2) breezy/check.py (+0/-2) breezy/chunk_writer.py (+0/-2) breezy/clean_tree.py (+0/-2) breezy/cmd_test_script.py (+0/-2) breezy/cmd_version_info.py (+0/-2) breezy/cmdline.py (+0/-2) breezy/colordiff.py (+0/-2) breezy/commands.py (+0/-2) breezy/commit.py (+0/-2) breezy/commit_signature_commands.py (+0/-2) breezy/config.py (+0/-1) breezy/conflicts.py (+0/-2) breezy/controldir.py (+0/-2) breezy/counted_lock.py (+0/-2) breezy/crash.py (+0/-2) breezy/debug.py (+0/-2) breezy/decorators.py (+0/-2) breezy/delta.py (+0/-2) breezy/diff.py (+0/-2) breezy/directory_service.py (+0/-2) breezy/doc/__init__.py (+0/-2) breezy/doc/api/__init__.py (+0/-2) breezy/doc_generate/__init__.py (+0/-2) breezy/doc_generate/autodoc_bash_completion.py (+0/-2) breezy/doc_generate/autodoc_man.py (+0/-2) breezy/doc_generate/autodoc_rstx.py (+0/-2) breezy/doc_generate/conf.py (+0/-2) breezy/email_message.py (+0/-2) breezy/errors.py (+0/-2) breezy/estimate_compressed_size.py (+0/-2) breezy/export.py (+0/-2) breezy/export_pot.py (+0/-2) breezy/externalcommand.py (+0/-2) breezy/fetch_ghosts.py (+0/-2) breezy/fifo_cache.py (+0/-2) breezy/filter_tree.py (+0/-2) breezy/filters/__init__.py (+0/-1) breezy/filters/eol.py (+0/-3) breezy/foreign.py (+0/-3) breezy/git/__init__.py (+0/-2) breezy/git/annotate.py (+0/-2) breezy/git/branch.py (+0/-1) breezy/git/cache.py (+0/-2) breezy/git/commands.py (+0/-2) breezy/git/commit.py (+0/-2) breezy/git/config.py (+0/-2) breezy/git/dir.py (+0/-2) breezy/git/directory.py (+0/-2) breezy/git/errors.py (+0/-3) breezy/git/fetch.py (+0/-2) breezy/git/filegraph.py (+0/-2) breezy/git/git_remote_helper.py (+0/-2) breezy/git/help.py (+0/-2) breezy/git/hg.py (+0/-2) breezy/git/interrepo.py (+0/-2) breezy/git/mapping.py (+0/-2) breezy/git/memorytree.py (+0/-2) breezy/git/object_store.py (+0/-2) breezy/git/pristine_tar.py (+0/-2) breezy/git/push.py (+0/-2) breezy/git/refs.py (+0/-2) breezy/git/remote.py (+0/-2) breezy/git/repository.py (+0/-2) breezy/git/revspec.py (+0/-2) breezy/git/roundtrip.py (+0/-2) breezy/git/send.py (+0/-2) breezy/git/server.py (+0/-2) breezy/git/tests/__init__.py (+0/-2) breezy/git/tests/test_blackbox.py (+0/-2) breezy/git/tests/test_branch.py (+0/-2) breezy/git/tests/test_builder.py (+0/-2) breezy/git/tests/test_cache.py (+0/-2) breezy/git/tests/test_dir.py (+0/-2) breezy/git/tests/test_fetch.py (+0/-2) breezy/git/tests/test_git_remote_helper.py (+0/-2) breezy/git/tests/test_mapping.py (+0/-2) breezy/git/tests/test_object_store.py (+0/-2) breezy/git/tests/test_pristine_tar.py (+0/-2) breezy/git/tests/test_push.py (+0/-2) breezy/git/tests/test_refs.py (+0/-2) breezy/git/tests/test_remote.py (+0/-2) breezy/git/tests/test_repository.py (+0/-2) breezy/git/tests/test_revspec.py (+0/-2) breezy/git/tests/test_roundtrip.py (+0/-2) breezy/git/tests/test_server.py (+0/-2) breezy/git/tests/test_transportgit.py (+0/-2) breezy/git/tests/test_unpeel_map.py (+0/-2) breezy/git/tests/test_urls.py (+0/-2) breezy/git/tests/test_workingtree.py (+0/-2) breezy/git/transportgit.py (+0/-2) breezy/git/tree.py (+0/-2) breezy/git/unpeel_map.py (+0/-1) breezy/git/urls.py (+0/-1) breezy/git/workingtree.py (+0/-2) breezy/globbing.py (+0/-2) breezy/gpg.py (+0/-2) breezy/graph.py (+0/-2) breezy/grep.py (+0/-2) breezy/hashcache.py (+0/-2) breezy/help.py (+0/-2) breezy/help_topics/__init__.py (+0/-2) breezy/hooks.py (+0/-2) breezy/i18n.py (+0/-2) breezy/identitymap.py (+0/-2) breezy/ignores.py (+0/-2) breezy/info.py (+0/-2) breezy/inter.py (+0/-2) breezy/iterablefile.py (+0/-2) breezy/lazy_import.py (+0/-2) breezy/lazy_regex.py (+0/-2) breezy/library_state.py (+0/-2) breezy/location.py (+0/-2) breezy/lock.py (+0/-2) breezy/lockable_files.py (+0/-2) breezy/lockdir.py (+0/-2) breezy/log.py (+0/-2) breezy/lru_cache.py (+0/-2) breezy/lsprof.py (+0/-2) breezy/mail_client.py (+0/-2) breezy/memorytree.py (+0/-2) breezy/merge.py (+0/-2) breezy/merge3.py (+0/-2) breezy/merge_directive.py (+0/-2) breezy/mergeable.py (+0/-2) breezy/mergetools.py (+0/-2) breezy/missing.py (+0/-2) breezy/msgeditor.py (+0/-2) breezy/multiparent.py (+0/-2) breezy/multiwalker.py (+0/-2) breezy/mutabletree.py (+0/-2) breezy/option.py (+0/-2) breezy/osutils.py (+0/-2) breezy/patch.py (+0/-2) breezy/patches.py (+0/-2) breezy/plugin.py (+0/-2) breezy/plugins/__init__.py (+0/-2) breezy/plugins/bash_completion/__init__.py (+0/-2) breezy/plugins/bash_completion/bashcomp.py (+0/-2) breezy/plugins/changelog_merge/__init__.py (+0/-2) breezy/plugins/changelog_merge/changelog_merge.py (+0/-2) breezy/plugins/commitfromnews/__init__.py (+0/-2) breezy/plugins/commitfromnews/committemplate.py (+0/-2) breezy/plugins/commitfromnews/tests/__init__.py (+0/-2) breezy/plugins/commitfromnews/tests/test_committemplate.py (+0/-2) breezy/plugins/commitfromnews/tests/test_msgeditor.py (+0/-2) breezy/plugins/cvs/__init__.py (+0/-2) breezy/plugins/darcs/__init__.py (+0/-2) breezy/plugins/email/__init__.py (+0/-2) breezy/plugins/email/emailer.py (+0/-2) breezy/plugins/fastimport/__init__.py (+0/-2) breezy/plugins/fastimport/branch_mapper.py (+0/-2) breezy/plugins/fastimport/branch_updater.py (+0/-2) breezy/plugins/fastimport/bzr_commit_handler.py (+0/-2) breezy/plugins/fastimport/cache_manager.py (+0/-2) breezy/plugins/fastimport/cmds.py (+0/-2) breezy/plugins/fastimport/exporter.py (+0/-2) breezy/plugins/fastimport/helpers.py (+0/-2) breezy/plugins/fastimport/idmapfile.py (+0/-2) breezy/plugins/fastimport/marks_file.py (+0/-2) breezy/plugins/fastimport/processors/__init__.py (+0/-2) breezy/plugins/fastimport/processors/generic_processor.py (+0/-2) breezy/plugins/fastimport/revision_store.py (+0/-2) breezy/plugins/fastimport/tests/__init__.py (+0/-2) breezy/plugins/fastimport/tests/test_branch_mapper.py (+0/-2) breezy/plugins/fastimport/tests/test_commands.py (+0/-2) breezy/plugins/fastimport/tests/test_exporter.py (+0/-2) breezy/plugins/fastimport/tests/test_generic_processor.py (+0/-2) breezy/plugins/fastimport/tests/test_head_tracking.py (+0/-2) breezy/plugins/fastimport/tests/test_revision_store.py (+0/-2) breezy/plugins/fastimport/user_mapper.py (+0/-2) breezy/plugins/flake8/__init__.py (+0/-2) breezy/plugins/fossil/__init__.py (+0/-2) breezy/plugins/hg/__init__.py (+0/-2) breezy/plugins/launchpad/__init__.py (+0/-2) breezy/plugins/launchpad/account.py (+0/-2) breezy/plugins/launchpad/cmds.py (+0/-2) breezy/plugins/launchpad/lp_api.py (+0/-2) breezy/plugins/launchpad/lp_directory.py (+0/-2) breezy/plugins/launchpad/lp_propose.py (+0/-2) breezy/plugins/launchpad/lp_registration.py (+0/-2) breezy/plugins/launchpad/uris.py (+0/-2) breezy/plugins/mtn/__init__.py (+0/-2) breezy/plugins/netrc_credential_store/__init__.py (+0/-2) breezy/plugins/news_merge/__init__.py (+0/-2) breezy/plugins/news_merge/news_merge.py (+0/-3) breezy/plugins/news_merge/parser.py (+0/-3) breezy/plugins/po_merge/__init__.py (+0/-2) breezy/plugins/po_merge/po_merge.py (+0/-2) breezy/plugins/propose/__init__.py (+0/-2) breezy/plugins/propose/cmds.py (+0/-2) breezy/plugins/propose/github.py (+0/-2) breezy/plugins/propose/gitlabs.py (+0/-2) breezy/plugins/propose/launchpad.py (+0/-2) breezy/plugins/quilt/__init__.py (+0/-2) breezy/plugins/quilt/merge.py (+0/-2) breezy/plugins/quilt/quilt.py (+0/-2) breezy/plugins/quilt/tests/__init__.py (+0/-2) breezy/plugins/quilt/tests/test_merge.py (+0/-2) breezy/plugins/quilt/tests/test_wrapper.py (+0/-2) breezy/plugins/quilt/wrapper.py (+0/-2) breezy/plugins/repodebug/__init__.py (+0/-2) breezy/plugins/repodebug/check_chk.py (+0/-2) breezy/plugins/repodebug/chk_used_by.py (+0/-2) breezy/plugins/repodebug/fetch_all_records.py (+0/-2) breezy/plugins/repodebug/file_refs.py (+0/-2) breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py (+0/-2) breezy/plugins/repodebug/repo_has_key.py (+0/-2) breezy/plugins/repodebug/repo_keys.py (+0/-2) breezy/plugins/rewrite/__init__.py (+0/-2) breezy/plugins/rewrite/commands.py (+0/-2) breezy/plugins/rewrite/maptree.py (+0/-2) breezy/plugins/rewrite/pseudonyms.py (+0/-2) breezy/plugins/rewrite/rebase.py (+0/-2) breezy/plugins/rewrite/upgrade.py (+0/-2) breezy/plugins/stats/__init__.py (+0/-2) breezy/plugins/stats/classify.py (+0/-2) breezy/plugins/stats/cmds.py (+0/-2) breezy/plugins/stats/test_blackbox.py (+0/-2) breezy/plugins/stats/test_classify.py (+0/-2) breezy/plugins/stats/test_stats.py (+0/-2) breezy/plugins/svn/__init__.py (+0/-2) breezy/plugins/upload/__init__.py (+0/-2) breezy/plugins/upload/cmds.py (+0/-2) breezy/plugins/weave_fmt/__init__.py (+0/-2) breezy/plugins/weave_fmt/branch.py (+0/-2) breezy/plugins/weave_fmt/bzrdir.py (+0/-2) breezy/plugins/weave_fmt/repository.py (+0/-2) breezy/plugins/weave_fmt/store/__init__.py (+0/-2) breezy/plugins/weave_fmt/store/text.py (+0/-2) breezy/plugins/weave_fmt/store/versioned.py (+0/-2) breezy/plugins/weave_fmt/test_bzrdir.py (+0/-2) breezy/plugins/weave_fmt/test_repository.py (+0/-2) breezy/plugins/weave_fmt/test_workingtree.py (+0/-2) breezy/plugins/weave_fmt/workingtree.py (+0/-2) breezy/plugins/weave_fmt/xml4.py (+0/-2) breezy/plugins/zsh_completion/__init__.py (+0/-2) breezy/plugins/zsh_completion/zshcomp.py (+0/-2) breezy/progress.py (+0/-2) breezy/propose.py (+0/-2) breezy/push.py (+0/-2) breezy/pyutils.py (+0/-2) breezy/reconcile.py (+0/-2) breezy/reconfigure.py (+0/-2) breezy/recordcounter.py (+0/-2) breezy/registry.py (+0/-2) breezy/rename_map.py (+0/-2) breezy/repository.py (+0/-2) breezy/revision.py (+0/-2) breezy/revisionspec.py (+0/-2) breezy/revisiontree.py (+0/-2) breezy/rio.py (+0/-2) breezy/rules.py (+0/-2) breezy/send.py (+0/-2) breezy/shelf.py (+0/-2) breezy/shelf_ui.py (+0/-2) breezy/shellcomplete.py (+0/-2) breezy/smtp_connection.py (+0/-2) breezy/static_tuple.py (+0/-2) breezy/status.py (+0/-2) breezy/strace.py (+0/-2) breezy/switch.py (+0/-2) breezy/symbol_versioning.py (+0/-2) breezy/tag.py (+0/-2) breezy/terminal.py (+0/-2) breezy/tests/__init__.py (+0/-2) breezy/tests/blackbox/test_bisect.py (+0/-2) breezy/tests/blackbox/test_log.py (+0/-2) breezy/tests/features.py (+0/-2) breezy/tests/test__rio.py (+0/-2) breezy/tests/test_bisect.py (+0/-2) breezy/tests/test_fetch_ghosts.py (+0/-2) breezy/tests/test_grep.py (+0/-2) breezy/tests/test_osutils.py (+0/-2) breezy/tests/test_source.py (+0/-20) breezy/tests/test_views.py (+0/-2) breezy/tests/ui_testing.py (+0/-2) breezy/textfile.py (+0/-2) breezy/textmerge.py (+0/-2) breezy/timestamp.py (+0/-2) breezy/trace.py (+0/-2) breezy/transactions.py (+0/-2) breezy/transform.py (+0/-2) breezy/transport/__init__.py (+0/-2) breezy/transport/brokenrename.py (+0/-2) breezy/transport/chroot.py (+0/-2) breezy/transport/decorator.py (+0/-2) breezy/transport/fakenfs.py (+0/-2) breezy/transport/fakevfat.py (+0/-2) breezy/transport/gio_transport.py (+0/-2) breezy/transport/http/__init__.py (+0/-2) breezy/transport/http/ca_bundle.py (+0/-2) breezy/transport/http/response.py (+0/-2) breezy/transport/http/wsgi.py (+0/-2) breezy/transport/local.py (+0/-2) breezy/transport/log.py (+0/-2) breezy/transport/memory.py (+0/-2) breezy/transport/nosmart.py (+0/-2) breezy/transport/pathfilter.py (+0/-2) breezy/transport/readonly.py (+0/-2) breezy/transport/remote.py (+0/-2) breezy/transport/sftp.py (+0/-2) breezy/transport/ssh.py (+0/-2) breezy/transport/trace.py (+0/-2) breezy/transport/unlistable.py (+0/-2) breezy/tree.py (+0/-2) breezy/treebuilder.py (+0/-2) breezy/tsort.py (+0/-2) breezy/tuned_gzip.py (+0/-2) breezy/ui/__init__.py (+0/-2) breezy/ui/text.py (+0/-2) breezy/uncommit.py (+0/-2) breezy/upgrade.py (+0/-2) breezy/upstream_import.py (+0/-2) breezy/url_policy_open.py (+0/-2) breezy/urlutils.py (+0/-2) breezy/utextwrap.py (+0/-2) breezy/util/__init__.py (+0/-1) breezy/util/_bencode_py.py (+0/-2) breezy/util/simplemapi.py (+0/-2) breezy/version.py (+0/-2) breezy/version_info_formats/__init__.py (+0/-2) breezy/version_info_formats/format_custom.py (+0/-2) breezy/version_info_formats/format_python.py (+0/-2) breezy/version_info_formats/format_rio.py (+0/-2) breezy/views.py (+0/-2) breezy/win32utils.py (+0/-2) breezy/workingtree.py (+0/-2) brz (+0/-2) profile_imports.py (+0/-4) tools/brzflakes.py (+0/-2) tools/capture_tree.py (+0/-2) tools/prepare_for_latex.py (+0/-2) |
To merge this branch: | bzr merge lp:~jelmer/brz/drop-future |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+379372@code.launchpad.net |
This proposal supersedes a proposal from 2020-02-18.
Commit message
Drop unnecessary imports from __future__.
Description of the change
Drop the use of 'from __future__', since we don't need it anymore now that we've dropped support for Python 2.7.
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) : Posted in a previous version of this proposal | # |
review:
Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote : Posted in a previous version of this proposal | # |
Revision history for this message
Jelmer Vernooij (jelmer) : Posted in a previous version of this proposal | # |
review:
Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote : | # |
Voting criteria not met
https:/
Revision history for this message
Jelmer Vernooij (jelmer) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'breezy/__init__.py' | |||
2 | --- breezy/__init__.py 2020-02-14 03:16:54 +0000 | |||
3 | +++ breezy/__init__.py 2020-02-18 05:49:35 +0000 | |||
4 | @@ -29,8 +29,6 @@ | |||
5 | 29 | We hope you enjoy this library. | 29 | We hope you enjoy this library. |
6 | 30 | """ | 30 | """ |
7 | 31 | 31 | ||
8 | 32 | from __future__ import absolute_import | ||
9 | 33 | |||
10 | 34 | import time | 32 | import time |
11 | 35 | 33 | ||
12 | 36 | # Keep track of when breezy was first imported, so that we can give rough | 34 | # Keep track of when breezy was first imported, so that we can give rough |
13 | @@ -43,7 +41,7 @@ | |||
14 | 43 | 41 | ||
15 | 44 | __copyright__ = ( | 42 | __copyright__ = ( |
16 | 45 | "Copyright 2005-2012 Canonical Ltd.\n" | 43 | "Copyright 2005-2012 Canonical Ltd.\n" |
18 | 46 | "Copyright 2017-2019 Breezy developers" | 44 | "Copyright 2017-2020 Breezy developers" |
19 | 47 | ) | 45 | ) |
20 | 48 | 46 | ||
21 | 49 | # same format as sys.version_info: "A tuple containing the five components of | 47 | # same format as sys.version_info: "A tuple containing the five components of |
22 | 50 | 48 | ||
23 | === modified file 'breezy/_annotator_py.py' | |||
24 | --- breezy/_annotator_py.py 2020-02-07 02:14:30 +0000 | |||
25 | +++ breezy/_annotator_py.py 2020-02-18 05:49:35 +0000 | |||
26 | @@ -16,8 +16,6 @@ | |||
27 | 16 | 16 | ||
28 | 17 | """Functionality for doing annotations in the 'optimal' way""" | 17 | """Functionality for doing annotations in the 'optimal' way""" |
29 | 18 | 18 | ||
30 | 19 | from __future__ import absolute_import | ||
31 | 20 | |||
32 | 21 | from .lazy_import import lazy_import | 19 | from .lazy_import import lazy_import |
33 | 22 | lazy_import(globals(), """ | 20 | lazy_import(globals(), """ |
34 | 23 | 21 | ||
35 | 24 | 22 | ||
36 | === modified file 'breezy/_annotator_pyx.pyx' | |||
37 | --- breezy/_annotator_pyx.pyx 2018-07-01 22:44:13 +0000 | |||
38 | +++ breezy/_annotator_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
39 | @@ -16,8 +16,6 @@ | |||
40 | 16 | 16 | ||
41 | 17 | """Functionality for doing annotations in the 'optimal' way""" | 17 | """Functionality for doing annotations in the 'optimal' way""" |
42 | 18 | 18 | ||
43 | 19 | from __future__ import absolute_import | ||
44 | 20 | |||
45 | 21 | 19 | ||
46 | 22 | cdef extern from "python-compat.h": | 20 | cdef extern from "python-compat.h": |
47 | 23 | pass | 21 | pass |
48 | 24 | 22 | ||
49 | === modified file 'breezy/_bencode_pyx.pyx' | |||
50 | --- breezy/_bencode_pyx.pyx 2018-08-21 19:28:52 +0000 | |||
51 | +++ breezy/_bencode_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
52 | @@ -16,8 +16,6 @@ | |||
53 | 16 | 16 | ||
54 | 17 | """Pyrex implementation for bencode coder/decoder""" | 17 | """Pyrex implementation for bencode coder/decoder""" |
55 | 18 | 18 | ||
56 | 19 | from __future__ import absolute_import | ||
57 | 20 | |||
58 | 21 | from cpython.bool cimport ( | 19 | from cpython.bool cimport ( |
59 | 22 | PyBool_Check, | 20 | PyBool_Check, |
60 | 23 | ) | 21 | ) |
61 | 24 | 22 | ||
62 | === modified file 'breezy/_chunks_to_lines_py.py' | |||
63 | --- breezy/_chunks_to_lines_py.py 2017-06-11 01:12:29 +0000 | |||
64 | +++ breezy/_chunks_to_lines_py.py 2020-02-18 05:49:35 +0000 | |||
65 | @@ -16,8 +16,6 @@ | |||
66 | 16 | 16 | ||
67 | 17 | """The python implementation of chunks_to_lines""" | 17 | """The python implementation of chunks_to_lines""" |
68 | 18 | 18 | ||
69 | 19 | from __future__ import absolute_import | ||
70 | 20 | |||
71 | 21 | 19 | ||
72 | 22 | def chunks_to_lines(chunks): | 20 | def chunks_to_lines(chunks): |
73 | 23 | """Re-split chunks into simple lines. | 21 | """Re-split chunks into simple lines. |
74 | 24 | 22 | ||
75 | === modified file 'breezy/_chunks_to_lines_pyx.pyx' | |||
76 | --- breezy/_chunks_to_lines_pyx.pyx 2018-07-01 20:02:53 +0000 | |||
77 | +++ breezy/_chunks_to_lines_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
78 | @@ -17,8 +17,6 @@ | |||
79 | 17 | 17 | ||
80 | 18 | """Pyrex extensions for converting chunks to lines.""" | 18 | """Pyrex extensions for converting chunks to lines.""" |
81 | 19 | 19 | ||
82 | 20 | from __future__ import absolute_import | ||
83 | 21 | |||
84 | 22 | 20 | ||
85 | 23 | cdef extern from "python-compat.h": | 21 | cdef extern from "python-compat.h": |
86 | 24 | pass | 22 | pass |
87 | 25 | 23 | ||
88 | === modified file 'breezy/_known_graph_py.py' | |||
89 | --- breezy/_known_graph_py.py 2020-02-07 02:14:30 +0000 | |||
90 | +++ breezy/_known_graph_py.py 2020-02-18 05:49:35 +0000 | |||
91 | @@ -17,8 +17,6 @@ | |||
92 | 17 | """Implementation of Graph algorithms when we have already loaded everything. | 17 | """Implementation of Graph algorithms when we have already loaded everything. |
93 | 18 | """ | 18 | """ |
94 | 19 | 19 | ||
95 | 20 | from __future__ import absolute_import | ||
96 | 21 | |||
97 | 22 | try: | 20 | try: |
98 | 23 | from collections.abc import deque | 21 | from collections.abc import deque |
99 | 24 | except ImportError: # python < 3.7 | 22 | except ImportError: # python < 3.7 |
100 | 25 | 23 | ||
101 | === modified file 'breezy/_known_graph_pyx.pyx' | |||
102 | --- breezy/_known_graph_pyx.pyx 2019-01-27 18:53:46 +0000 | |||
103 | +++ breezy/_known_graph_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
104 | @@ -17,8 +17,6 @@ | |||
105 | 17 | """Implementation of Graph algorithms when we have already loaded everything. | 17 | """Implementation of Graph algorithms when we have already loaded everything. |
106 | 18 | """ | 18 | """ |
107 | 19 | 19 | ||
108 | 20 | from __future__ import absolute_import | ||
109 | 21 | |||
110 | 22 | cdef extern from "python-compat.h": | 20 | cdef extern from "python-compat.h": |
111 | 23 | pass | 21 | pass |
112 | 24 | 22 | ||
113 | 25 | 23 | ||
114 | === modified file 'breezy/_readdir_py.py' | |||
115 | --- breezy/_readdir_py.py 2017-11-12 13:53:51 +0000 | |||
116 | +++ breezy/_readdir_py.py 2020-02-18 05:49:35 +0000 | |||
117 | @@ -16,8 +16,6 @@ | |||
118 | 16 | 16 | ||
119 | 17 | """Python implementation of readdir interface.""" | 17 | """Python implementation of readdir interface.""" |
120 | 18 | 18 | ||
121 | 19 | from __future__ import absolute_import | ||
122 | 20 | |||
123 | 21 | import stat | 19 | import stat |
124 | 22 | 20 | ||
125 | 23 | 21 | ||
126 | 24 | 22 | ||
127 | === modified file 'breezy/_readdir_pyx.pyx' | |||
128 | --- breezy/_readdir_pyx.pyx 2018-08-18 22:45:58 +0000 | |||
129 | +++ breezy/_readdir_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
130 | @@ -16,8 +16,6 @@ | |||
131 | 16 | 16 | ||
132 | 17 | """Wrapper for readdir which returns files ordered by inode.""" | 17 | """Wrapper for readdir which returns files ordered by inode.""" |
133 | 18 | 18 | ||
134 | 19 | from __future__ import absolute_import | ||
135 | 20 | |||
136 | 21 | 19 | ||
137 | 22 | import os | 20 | import os |
138 | 23 | import sys | 21 | import sys |
139 | 24 | 22 | ||
140 | === modified file 'breezy/_rio_py.py' | |||
141 | --- breezy/_rio_py.py 2018-11-11 04:08:32 +0000 | |||
142 | +++ breezy/_rio_py.py 2020-02-18 05:49:35 +0000 | |||
143 | @@ -16,8 +16,6 @@ | |||
144 | 16 | 16 | ||
145 | 17 | """Python implementation of _read_stanza_*.""" | 17 | """Python implementation of _read_stanza_*.""" |
146 | 18 | 18 | ||
147 | 19 | from __future__ import absolute_import | ||
148 | 20 | |||
149 | 21 | import re | 19 | import re |
150 | 22 | 20 | ||
151 | 23 | from .rio import ( | 21 | from .rio import ( |
152 | 24 | 22 | ||
153 | === modified file 'breezy/_rio_pyx.pyx' | |||
154 | --- breezy/_rio_pyx.pyx 2018-08-18 19:43:40 +0000 | |||
155 | +++ breezy/_rio_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
156 | @@ -16,8 +16,6 @@ | |||
157 | 16 | 16 | ||
158 | 17 | """Pyrex implementation of _read_stanza_*.""" | 17 | """Pyrex implementation of _read_stanza_*.""" |
159 | 18 | 18 | ||
160 | 19 | from __future__ import absolute_import | ||
161 | 20 | |||
162 | 21 | 19 | ||
163 | 22 | cdef extern from "python-compat.h": | 20 | cdef extern from "python-compat.h": |
164 | 23 | pass | 21 | pass |
165 | 24 | 22 | ||
166 | === modified file 'breezy/_simple_set_pyx.pyx' | |||
167 | --- breezy/_simple_set_pyx.pyx 2017-06-21 22:25:57 +0000 | |||
168 | +++ breezy/_simple_set_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
169 | @@ -16,8 +16,6 @@ | |||
170 | 16 | 16 | ||
171 | 17 | """Definition of a class that is similar to Set with some small changes.""" | 17 | """Definition of a class that is similar to Set with some small changes.""" |
172 | 18 | 18 | ||
173 | 19 | from __future__ import absolute_import | ||
174 | 20 | |||
175 | 21 | from cpython.object cimport ( | 19 | from cpython.object cimport ( |
176 | 22 | hashfunc, | 20 | hashfunc, |
177 | 23 | Py_EQ, | 21 | Py_EQ, |
178 | 24 | 22 | ||
179 | === modified file 'breezy/_static_tuple_py.py' | |||
180 | --- breezy/_static_tuple_py.py 2020-02-07 02:14:30 +0000 | |||
181 | +++ breezy/_static_tuple_py.py 2020-02-18 05:49:35 +0000 | |||
182 | @@ -20,8 +20,6 @@ | |||
183 | 20 | strings. | 20 | strings. |
184 | 21 | """ | 21 | """ |
185 | 22 | 22 | ||
186 | 23 | from __future__ import absolute_import | ||
187 | 24 | |||
188 | 25 | import sys | 23 | import sys |
189 | 26 | 24 | ||
190 | 27 | 25 | ||
191 | 28 | 26 | ||
192 | === modified file 'breezy/_termcolor.py' | |||
193 | --- breezy/_termcolor.py 2018-11-11 04:08:32 +0000 | |||
194 | +++ breezy/_termcolor.py 2020-02-18 05:49:35 +0000 | |||
195 | @@ -14,8 +14,6 @@ | |||
196 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
197 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
198 | 16 | 16 | ||
199 | 17 | from __future__ import absolute_import | ||
200 | 18 | |||
201 | 19 | import os | 17 | import os |
202 | 20 | import sys | 18 | import sys |
203 | 21 | 19 | ||
204 | 22 | 20 | ||
205 | === modified file 'breezy/_walkdirs_win32.pyx' | |||
206 | --- breezy/_walkdirs_win32.pyx 2017-06-10 00:09:13 +0000 | |||
207 | +++ breezy/_walkdirs_win32.pyx 2020-02-18 05:49:35 +0000 | |||
208 | @@ -16,8 +16,6 @@ | |||
209 | 16 | 16 | ||
210 | 17 | """Helper functions for Walkdirs on win32.""" | 17 | """Helper functions for Walkdirs on win32.""" |
211 | 18 | 18 | ||
212 | 19 | from __future__ import absolute_import | ||
213 | 20 | |||
214 | 21 | 19 | ||
215 | 22 | cdef extern from "python-compat.h": | 20 | cdef extern from "python-compat.h": |
216 | 23 | struct _HANDLE: | 21 | struct _HANDLE: |
217 | 24 | 22 | ||
218 | === modified file 'breezy/add.py' | |||
219 | --- breezy/add.py 2018-11-10 17:52:47 +0000 | |||
220 | +++ breezy/add.py 2020-02-18 05:49:35 +0000 | |||
221 | @@ -16,8 +16,6 @@ | |||
222 | 16 | 16 | ||
223 | 17 | """Helper functions for adding files to working trees.""" | 17 | """Helper functions for adding files to working trees.""" |
224 | 18 | 18 | ||
225 | 19 | from __future__ import absolute_import | ||
226 | 20 | |||
227 | 21 | import sys | 19 | import sys |
228 | 22 | import os | 20 | import os |
229 | 23 | 21 | ||
230 | 24 | 22 | ||
231 | === modified file 'breezy/annotate.py' | |||
232 | --- breezy/annotate.py 2020-01-11 17:41:33 +0000 | |||
233 | +++ breezy/annotate.py 2020-02-18 05:49:35 +0000 | |||
234 | @@ -16,8 +16,6 @@ | |||
235 | 16 | 16 | ||
236 | 17 | """File annotate based on weave storage""" | 17 | """File annotate based on weave storage""" |
237 | 18 | 18 | ||
238 | 19 | from __future__ import absolute_import | ||
239 | 20 | |||
240 | 21 | # TODO: Choice of more or less verbose formats: | 19 | # TODO: Choice of more or less verbose formats: |
241 | 22 | # | 20 | # |
242 | 23 | # interposed: show more details between blocks of modified lines | 21 | # interposed: show more details between blocks of modified lines |
243 | 24 | 22 | ||
244 | === modified file 'breezy/archive/__init__.py' | |||
245 | --- breezy/archive/__init__.py 2018-11-11 04:08:32 +0000 | |||
246 | +++ breezy/archive/__init__.py 2020-02-18 05:49:35 +0000 | |||
247 | @@ -17,8 +17,6 @@ | |||
248 | 17 | """Export trees to tarballs, zipfiles, etc. | 17 | """Export trees to tarballs, zipfiles, etc. |
249 | 18 | """ | 18 | """ |
250 | 19 | 19 | ||
251 | 20 | from __future__ import absolute_import | ||
252 | 21 | |||
253 | 22 | import os | 20 | import os |
254 | 23 | import time | 21 | import time |
255 | 24 | import warnings | 22 | import warnings |
256 | 25 | 23 | ||
257 | === modified file 'breezy/archive/tar.py' | |||
258 | --- breezy/archive/tar.py 2020-02-07 02:14:30 +0000 | |||
259 | +++ breezy/archive/tar.py 2020-02-18 05:49:35 +0000 | |||
260 | @@ -16,8 +16,6 @@ | |||
261 | 16 | 16 | ||
262 | 17 | """Export a tree to a tarball.""" | 17 | """Export a tree to a tarball.""" |
263 | 18 | 18 | ||
264 | 19 | from __future__ import absolute_import | ||
265 | 20 | |||
266 | 21 | from contextlib import closing | 19 | from contextlib import closing |
267 | 22 | from io import BytesIO | 20 | from io import BytesIO |
268 | 23 | import os | 21 | import os |
269 | 24 | 22 | ||
270 | === modified file 'breezy/archive/zip.py' | |||
271 | --- breezy/archive/zip.py 2018-11-16 18:33:17 +0000 | |||
272 | +++ breezy/archive/zip.py 2020-02-18 05:49:35 +0000 | |||
273 | @@ -17,8 +17,6 @@ | |||
274 | 17 | """Export a Tree to a zip file. | 17 | """Export a Tree to a zip file. |
275 | 18 | """ | 18 | """ |
276 | 19 | 19 | ||
277 | 20 | from __future__ import absolute_import | ||
278 | 21 | |||
279 | 22 | from contextlib import closing | 20 | from contextlib import closing |
280 | 23 | import os | 21 | import os |
281 | 24 | import stat | 22 | import stat |
282 | 25 | 23 | ||
283 | === modified file 'breezy/atomicfile.py' | |||
284 | --- breezy/atomicfile.py 2018-11-10 17:52:47 +0000 | |||
285 | +++ breezy/atomicfile.py 2020-02-18 05:49:35 +0000 | |||
286 | @@ -14,8 +14,6 @@ | |||
287 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
288 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
289 | 16 | 16 | ||
290 | 17 | from __future__ import absolute_import | ||
291 | 18 | |||
292 | 19 | import os | 17 | import os |
293 | 20 | 18 | ||
294 | 21 | import stat | 19 | import stat |
295 | 22 | 20 | ||
296 | === modified file 'breezy/bedding.py' | |||
297 | --- breezy/bedding.py 2020-02-07 02:14:30 +0000 | |||
298 | +++ breezy/bedding.py 2020-02-18 05:49:35 +0000 | |||
299 | @@ -17,8 +17,6 @@ | |||
300 | 17 | 17 | ||
301 | 18 | """Functions for deriving user configuration from system environment.""" | 18 | """Functions for deriving user configuration from system environment.""" |
302 | 19 | 19 | ||
303 | 20 | from __future__ import absolute_import | ||
304 | 21 | |||
305 | 22 | import os | 20 | import os |
306 | 23 | import sys | 21 | import sys |
307 | 24 | 22 | ||
308 | 25 | 23 | ||
309 | === modified file 'breezy/bencode.py' | |||
310 | --- breezy/bencode.py 2018-11-11 03:33:20 +0000 | |||
311 | +++ breezy/bencode.py 2020-02-18 05:49:35 +0000 | |||
312 | @@ -16,8 +16,6 @@ | |||
313 | 16 | 16 | ||
314 | 17 | """Wrapper around the bencode pyrex and python implementation""" | 17 | """Wrapper around the bencode pyrex and python implementation""" |
315 | 18 | 18 | ||
316 | 19 | from __future__ import absolute_import | ||
317 | 20 | |||
318 | 21 | from . import osutils | 19 | from . import osutils |
319 | 22 | 20 | ||
320 | 23 | try: | 21 | try: |
321 | 24 | 22 | ||
322 | === modified file 'breezy/bisect.py' | |||
323 | --- breezy/bisect.py 2020-02-07 02:14:30 +0000 | |||
324 | +++ breezy/bisect.py 2020-02-18 05:49:35 +0000 | |||
325 | @@ -16,8 +16,6 @@ | |||
326 | 16 | 16 | ||
327 | 17 | """bisect command implementations.""" | 17 | """bisect command implementations.""" |
328 | 18 | 18 | ||
329 | 19 | from __future__ import absolute_import | ||
330 | 20 | |||
331 | 21 | import sys | 19 | import sys |
332 | 22 | from .controldir import ControlDir | 20 | from .controldir import ControlDir |
333 | 23 | from . import revision as _mod_revision | 21 | from . import revision as _mod_revision |
334 | 24 | 22 | ||
335 | === modified file 'breezy/bisect_multi.py' | |||
336 | --- breezy/bisect_multi.py 2018-11-11 14:23:06 +0000 | |||
337 | +++ breezy/bisect_multi.py 2020-02-18 05:49:35 +0000 | |||
338 | @@ -16,8 +16,6 @@ | |||
339 | 16 | 16 | ||
340 | 17 | """Bisection lookup multiple keys.""" | 17 | """Bisection lookup multiple keys.""" |
341 | 18 | 18 | ||
342 | 19 | from __future__ import absolute_import | ||
343 | 20 | |||
344 | 21 | __all__ = [ | 19 | __all__ = [ |
345 | 22 | 'bisect_multi_bytes', | 20 | 'bisect_multi_bytes', |
346 | 23 | ] | 21 | ] |
347 | 24 | 22 | ||
348 | === modified file 'breezy/branch.py' | |||
349 | --- breezy/branch.py 2020-02-07 02:14:30 +0000 | |||
350 | +++ breezy/branch.py 2020-02-18 05:49:35 +0000 | |||
351 | @@ -14,8 +14,6 @@ | |||
352 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
353 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
354 | 16 | 16 | ||
355 | 17 | from __future__ import absolute_import | ||
356 | 18 | |||
357 | 19 | from .lazy_import import lazy_import | 17 | from .lazy_import import lazy_import |
358 | 20 | lazy_import(globals(), """ | 18 | lazy_import(globals(), """ |
359 | 21 | import contextlib | 19 | import contextlib |
360 | 22 | 20 | ||
361 | === modified file 'breezy/branchbuilder.py' | |||
362 | --- breezy/branchbuilder.py 2020-02-07 02:14:30 +0000 | |||
363 | +++ breezy/branchbuilder.py 2020-02-18 05:49:35 +0000 | |||
364 | @@ -16,8 +16,6 @@ | |||
365 | 16 | 16 | ||
366 | 17 | """Utility for create branches with particular contents.""" | 17 | """Utility for create branches with particular contents.""" |
367 | 18 | 18 | ||
368 | 19 | from __future__ import absolute_import | ||
369 | 20 | |||
370 | 21 | from . import ( | 19 | from . import ( |
371 | 22 | controldir, | 20 | controldir, |
372 | 23 | commit, | 21 | commit, |
373 | 24 | 22 | ||
374 | === modified file 'breezy/breakin.py' | |||
375 | --- breezy/breakin.py 2018-11-11 03:33:20 +0000 | |||
376 | +++ breezy/breakin.py 2020-02-18 05:49:35 +0000 | |||
377 | @@ -14,8 +14,6 @@ | |||
378 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
379 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
380 | 16 | 16 | ||
381 | 17 | from __future__ import absolute_import | ||
382 | 18 | |||
383 | 19 | import os | 17 | import os |
384 | 20 | import signal | 18 | import signal |
385 | 21 | 19 | ||
386 | 22 | 20 | ||
387 | === modified file 'breezy/bugtracker.py' | |||
388 | --- breezy/bugtracker.py 2018-11-17 01:04:53 +0000 | |||
389 | +++ breezy/bugtracker.py 2020-02-18 05:49:35 +0000 | |||
390 | @@ -14,8 +14,6 @@ | |||
391 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
392 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
393 | 16 | 16 | ||
394 | 17 | from __future__ import absolute_import | ||
395 | 18 | |||
396 | 19 | from . import ( | 17 | from . import ( |
397 | 20 | errors, | 18 | errors, |
398 | 21 | registry, | 19 | registry, |
399 | 22 | 20 | ||
400 | === modified file 'breezy/builtins.py' | |||
401 | --- breezy/builtins.py 2020-02-07 02:14:30 +0000 | |||
402 | +++ breezy/builtins.py 2020-02-18 05:49:35 +0000 | |||
403 | @@ -16,8 +16,6 @@ | |||
404 | 16 | 16 | ||
405 | 17 | """builtin brz commands""" | 17 | """builtin brz commands""" |
406 | 18 | 18 | ||
407 | 19 | from __future__ import absolute_import | ||
408 | 20 | |||
409 | 21 | import errno | 19 | import errno |
410 | 22 | import os | 20 | import os |
411 | 23 | import sys | 21 | import sys |
412 | 24 | 22 | ||
413 | === modified file 'breezy/bzr/__init__.py' | |||
414 | --- breezy/bzr/__init__.py 2019-11-06 01:31:41 +0000 | |||
415 | +++ breezy/bzr/__init__.py 2020-02-18 05:49:35 +0000 | |||
416 | @@ -14,8 +14,6 @@ | |||
417 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
418 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
419 | 16 | 16 | ||
420 | 17 | from __future__ import absolute_import | ||
421 | 18 | |||
422 | 19 | from .. import ( | 17 | from .. import ( |
423 | 20 | config, | 18 | config, |
424 | 21 | errors, | 19 | errors, |
425 | 22 | 20 | ||
426 | === modified file 'breezy/bzr/_btree_serializer_py.py' | |||
427 | --- breezy/bzr/_btree_serializer_py.py 2018-11-11 04:08:32 +0000 | |||
428 | +++ breezy/bzr/_btree_serializer_py.py 2020-02-18 05:49:35 +0000 | |||
429 | @@ -17,8 +17,6 @@ | |||
430 | 17 | 17 | ||
431 | 18 | """B+Tree index parsing.""" | 18 | """B+Tree index parsing.""" |
432 | 19 | 19 | ||
433 | 20 | from __future__ import absolute_import | ||
434 | 21 | |||
435 | 22 | from .. import static_tuple | 20 | from .. import static_tuple |
436 | 23 | 21 | ||
437 | 24 | 22 | ||
438 | 25 | 23 | ||
439 | === modified file 'breezy/bzr/_btree_serializer_pyx.pyx' | |||
440 | --- breezy/bzr/_btree_serializer_pyx.pyx 2019-09-22 02:25:23 +0000 | |||
441 | +++ breezy/bzr/_btree_serializer_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
442 | @@ -17,8 +17,6 @@ | |||
443 | 17 | 17 | ||
444 | 18 | """Pyrex extensions to btree node parsing.""" | 18 | """Pyrex extensions to btree node parsing.""" |
445 | 19 | 19 | ||
446 | 20 | from __future__ import absolute_import | ||
447 | 21 | |||
448 | 22 | 20 | ||
449 | 23 | cdef extern from "python-compat.h": | 21 | cdef extern from "python-compat.h": |
450 | 24 | pass | 22 | pass |
451 | 25 | 23 | ||
452 | === modified file 'breezy/bzr/_chk_map_py.py' | |||
453 | --- breezy/bzr/_chk_map_py.py 2020-02-07 02:14:30 +0000 | |||
454 | +++ breezy/bzr/_chk_map_py.py 2020-02-18 05:49:35 +0000 | |||
455 | @@ -16,8 +16,6 @@ | |||
456 | 16 | 16 | ||
457 | 17 | """Python implementation of _search_key functions, etc.""" | 17 | """Python implementation of _search_key functions, etc.""" |
458 | 18 | 18 | ||
459 | 19 | from __future__ import absolute_import | ||
460 | 20 | |||
461 | 21 | import zlib | 19 | import zlib |
462 | 22 | import struct | 20 | import struct |
463 | 23 | 21 | ||
464 | 24 | 22 | ||
465 | === modified file 'breezy/bzr/_chk_map_pyx.pyx' | |||
466 | --- breezy/bzr/_chk_map_pyx.pyx 2019-09-22 02:25:23 +0000 | |||
467 | +++ breezy/bzr/_chk_map_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
468 | @@ -14,8 +14,6 @@ | |||
469 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
470 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
471 | 16 | 16 | ||
472 | 17 | from __future__ import absolute_import | ||
473 | 18 | |||
474 | 19 | cdef extern from "python-compat.h": | 17 | cdef extern from "python-compat.h": |
475 | 20 | pass | 18 | pass |
476 | 21 | 19 | ||
477 | 22 | 20 | ||
478 | === modified file 'breezy/bzr/_dirstate_helpers_py.py' | |||
479 | --- breezy/bzr/_dirstate_helpers_py.py 2020-02-07 02:14:30 +0000 | |||
480 | +++ breezy/bzr/_dirstate_helpers_py.py 2020-02-18 05:49:35 +0000 | |||
481 | @@ -16,8 +16,6 @@ | |||
482 | 16 | 16 | ||
483 | 17 | """Python implementations of Dirstate Helper functions.""" | 17 | """Python implementations of Dirstate Helper functions.""" |
484 | 18 | 18 | ||
485 | 19 | from __future__ import absolute_import | ||
486 | 20 | |||
487 | 21 | import binascii | 19 | import binascii |
488 | 22 | import os | 20 | import os |
489 | 23 | import struct | 21 | import struct |
490 | 24 | 22 | ||
491 | === modified file 'breezy/bzr/_dirstate_helpers_pyx.pyx' | |||
492 | --- breezy/bzr/_dirstate_helpers_pyx.pyx 2020-01-31 10:39:02 +0000 | |||
493 | +++ breezy/bzr/_dirstate_helpers_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
494 | @@ -19,8 +19,6 @@ | |||
495 | 19 | This is the python implementation for DirState functions. | 19 | This is the python implementation for DirState functions. |
496 | 20 | """ | 20 | """ |
497 | 21 | 21 | ||
498 | 22 | from __future__ import absolute_import | ||
499 | 23 | |||
500 | 24 | import binascii | 22 | import binascii |
501 | 25 | import bisect | 23 | import bisect |
502 | 26 | import errno | 24 | import errno |
503 | 27 | 25 | ||
504 | === modified file 'breezy/bzr/_groupcompress_py.py' | |||
505 | --- breezy/bzr/_groupcompress_py.py 2020-02-07 02:14:30 +0000 | |||
506 | +++ breezy/bzr/_groupcompress_py.py 2020-02-18 05:49:35 +0000 | |||
507 | @@ -20,8 +20,6 @@ | |||
508 | 20 | useless stuff. | 20 | useless stuff. |
509 | 21 | """ | 21 | """ |
510 | 22 | 22 | ||
511 | 23 | from __future__ import absolute_import | ||
512 | 24 | |||
513 | 25 | from .. import osutils | 23 | from .. import osutils |
514 | 26 | 24 | ||
515 | 27 | 25 | ||
516 | 28 | 26 | ||
517 | === modified file 'breezy/bzr/_groupcompress_pyx.pyx' | |||
518 | --- breezy/bzr/_groupcompress_pyx.pyx 2018-11-16 13:30:16 +0000 | |||
519 | +++ breezy/bzr/_groupcompress_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
520 | @@ -16,8 +16,6 @@ | |||
521 | 16 | 16 | ||
522 | 17 | """Compiled extensions for doing compression.""" | 17 | """Compiled extensions for doing compression.""" |
523 | 18 | 18 | ||
524 | 19 | from __future__ import absolute_import | ||
525 | 20 | |||
526 | 21 | 19 | ||
527 | 22 | cdef extern from "python-compat.h": | 20 | cdef extern from "python-compat.h": |
528 | 23 | pass | 21 | pass |
529 | 24 | 22 | ||
530 | === modified file 'breezy/bzr/_knit_load_data_py.py' | |||
531 | --- breezy/bzr/_knit_load_data_py.py 2019-03-18 04:31:21 +0000 | |||
532 | +++ breezy/bzr/_knit_load_data_py.py 2020-02-18 05:49:35 +0000 | |||
533 | @@ -14,8 +14,6 @@ | |||
534 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
535 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
536 | 16 | 16 | ||
537 | 17 | from __future__ import absolute_import | ||
538 | 18 | |||
539 | 19 | from .knit import KnitCorrupt | 17 | from .knit import KnitCorrupt |
540 | 20 | 18 | ||
541 | 21 | 19 | ||
542 | 22 | 20 | ||
543 | === modified file 'breezy/bzr/_knit_load_data_pyx.pyx' | |||
544 | --- breezy/bzr/_knit_load_data_pyx.pyx 2018-07-03 17:23:58 +0000 | |||
545 | +++ breezy/bzr/_knit_load_data_pyx.pyx 2020-02-18 05:49:35 +0000 | |||
546 | @@ -16,8 +16,6 @@ | |||
547 | 16 | 16 | ||
548 | 17 | """Pyrex extensions to knit parsing.""" | 17 | """Pyrex extensions to knit parsing.""" |
549 | 18 | 18 | ||
550 | 19 | from __future__ import absolute_import | ||
551 | 20 | |||
552 | 21 | import sys | 19 | import sys |
553 | 22 | 20 | ||
554 | 23 | from .knit import KnitCorrupt | 21 | from .knit import KnitCorrupt |
555 | 24 | 22 | ||
556 | === modified file 'breezy/bzr/_str_helpers.pxd' | |||
557 | --- breezy/bzr/_str_helpers.pxd 2018-07-12 01:43:49 +0000 | |||
558 | +++ breezy/bzr/_str_helpers.pxd 2020-02-18 05:49:35 +0000 | |||
559 | @@ -17,8 +17,6 @@ | |||
560 | 17 | 17 | ||
561 | 18 | """Trivial string helpers for use in other cython modules.""" | 18 | """Trivial string helpers for use in other cython modules.""" |
562 | 19 | 19 | ||
563 | 20 | from __future__ import absolute_import | ||
564 | 21 | |||
565 | 22 | cdef extern from "python-compat.h": | 20 | cdef extern from "python-compat.h": |
566 | 23 | object PyBytes_FromStringAndSize (char *, Py_ssize_t) | 21 | object PyBytes_FromStringAndSize (char *, Py_ssize_t) |
567 | 24 | object PyBytes_InternFromStringAndSize (char *, Py_ssize_t) | 22 | object PyBytes_InternFromStringAndSize (char *, Py_ssize_t) |
568 | 25 | 23 | ||
569 | === modified file 'breezy/bzr/branch.py' | |||
570 | --- breezy/bzr/branch.py 2020-02-07 02:14:30 +0000 | |||
571 | +++ breezy/bzr/branch.py 2020-02-18 05:49:35 +0000 | |||
572 | @@ -15,8 +15,6 @@ | |||
573 | 15 | # along with this program; if not, write to the Free Software | 15 | # along with this program; if not, write to the Free Software |
574 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
575 | 17 | 17 | ||
576 | 18 | from __future__ import absolute_import | ||
577 | 19 | |||
578 | 20 | from io import BytesIO | 18 | from io import BytesIO |
579 | 21 | import sys | 19 | import sys |
580 | 22 | 20 | ||
581 | 23 | 21 | ||
582 | === modified file 'breezy/bzr/btree_index.py' | |||
583 | --- breezy/bzr/btree_index.py 2020-02-07 02:14:30 +0000 | |||
584 | +++ breezy/bzr/btree_index.py 2020-02-18 05:49:35 +0000 | |||
585 | @@ -17,8 +17,6 @@ | |||
586 | 17 | 17 | ||
587 | 18 | """B+Tree indices""" | 18 | """B+Tree indices""" |
588 | 19 | 19 | ||
589 | 20 | from __future__ import absolute_import, division | ||
590 | 21 | |||
591 | 22 | from io import BytesIO | 20 | from io import BytesIO |
592 | 23 | 21 | ||
593 | 24 | from ..lazy_import import lazy_import | 22 | from ..lazy_import import lazy_import |
594 | 25 | 23 | ||
595 | === modified file 'breezy/bzr/bundle/__init__.py' | |||
596 | --- breezy/bzr/bundle/__init__.py 2019-06-30 10:50:40 +0000 | |||
597 | +++ breezy/bzr/bundle/__init__.py 2020-02-18 05:49:35 +0000 | |||
598 | @@ -13,5 +13,3 @@ | |||
599 | 13 | # You should have received a copy of the GNU General Public License | 13 | # You should have received a copy of the GNU General Public License |
600 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
601 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
602 | 16 | |||
603 | 17 | from __future__ import absolute_import | ||
604 | 18 | 16 | ||
605 | === modified file 'breezy/bzr/bundle/apply_bundle.py' | |||
606 | --- breezy/bzr/bundle/apply_bundle.py 2019-06-30 10:50:40 +0000 | |||
607 | +++ breezy/bzr/bundle/apply_bundle.py 2020-02-18 05:49:35 +0000 | |||
608 | @@ -18,8 +18,6 @@ | |||
609 | 18 | This contains functionality for installing bundles into repositories | 18 | This contains functionality for installing bundles into repositories |
610 | 19 | """ | 19 | """ |
611 | 20 | 20 | ||
612 | 21 | from __future__ import absolute_import | ||
613 | 22 | |||
614 | 23 | from ... import ui | 21 | from ... import ui |
615 | 24 | from ...i18n import gettext | 22 | from ...i18n import gettext |
616 | 25 | from ...merge import Merger | 23 | from ...merge import Merger |
617 | 26 | 24 | ||
618 | === modified file 'breezy/bzr/bundle/bundle_data.py' | |||
619 | --- breezy/bzr/bundle/bundle_data.py 2020-02-13 23:57:28 +0000 | |||
620 | +++ breezy/bzr/bundle/bundle_data.py 2020-02-18 05:49:35 +0000 | |||
621 | @@ -16,8 +16,6 @@ | |||
622 | 16 | 16 | ||
623 | 17 | """Read in a bundle stream, and process it into a BundleReader object.""" | 17 | """Read in a bundle stream, and process it into a BundleReader object.""" |
624 | 18 | 18 | ||
625 | 19 | from __future__ import absolute_import | ||
626 | 20 | |||
627 | 21 | import base64 | 19 | import base64 |
628 | 22 | from io import BytesIO | 20 | from io import BytesIO |
629 | 23 | import os | 21 | import os |
630 | 24 | 22 | ||
631 | === modified file 'breezy/bzr/bundle/commands.py' | |||
632 | --- breezy/bzr/bundle/commands.py 2020-02-07 02:14:30 +0000 | |||
633 | +++ breezy/bzr/bundle/commands.py 2020-02-18 05:49:35 +0000 | |||
634 | @@ -21,8 +21,6 @@ | |||
635 | 21 | and for applying a changeset. | 21 | and for applying a changeset. |
636 | 22 | """ | 22 | """ |
637 | 23 | 23 | ||
638 | 24 | from __future__ import absolute_import | ||
639 | 25 | |||
640 | 26 | from io import BytesIO | 24 | from io import BytesIO |
641 | 27 | 25 | ||
642 | 28 | from ... import ( | 26 | from ... import ( |
643 | 29 | 27 | ||
644 | === modified file 'breezy/bzr/bundle/serializer/__init__.py' | |||
645 | --- breezy/bzr/bundle/serializer/__init__.py 2020-02-07 02:14:30 +0000 | |||
646 | +++ breezy/bzr/bundle/serializer/__init__.py 2020-02-18 05:49:35 +0000 | |||
647 | @@ -17,8 +17,6 @@ | |||
648 | 17 | """Serializer factory for reading and writing bundles. | 17 | """Serializer factory for reading and writing bundles. |
649 | 18 | """ | 18 | """ |
650 | 19 | 19 | ||
651 | 20 | from __future__ import absolute_import | ||
652 | 21 | |||
653 | 22 | import base64 | 20 | import base64 |
654 | 23 | from io import BytesIO | 21 | from io import BytesIO |
655 | 24 | import re | 22 | import re |
656 | 25 | 23 | ||
657 | === modified file 'breezy/bzr/bundle/serializer/v08.py' | |||
658 | --- breezy/bzr/bundle/serializer/v08.py 2020-02-07 02:14:30 +0000 | |||
659 | +++ breezy/bzr/bundle/serializer/v08.py 2020-02-18 05:49:35 +0000 | |||
660 | @@ -17,8 +17,6 @@ | |||
661 | 17 | """Serializer factory for reading and writing bundles. | 17 | """Serializer factory for reading and writing bundles. |
662 | 18 | """ | 18 | """ |
663 | 19 | 19 | ||
664 | 20 | from __future__ import absolute_import | ||
665 | 21 | |||
666 | 22 | from .... import ( | 20 | from .... import ( |
667 | 23 | errors, | 21 | errors, |
668 | 24 | ui, | 22 | ui, |
669 | 25 | 23 | ||
670 | === modified file 'breezy/bzr/bundle/serializer/v09.py' | |||
671 | --- breezy/bzr/bundle/serializer/v09.py 2019-09-21 15:10:27 +0000 | |||
672 | +++ breezy/bzr/bundle/serializer/v09.py 2020-02-18 05:49:35 +0000 | |||
673 | @@ -14,8 +14,6 @@ | |||
674 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
675 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
676 | 16 | 16 | ||
677 | 17 | from __future__ import absolute_import | ||
678 | 18 | |||
679 | 19 | from . import _get_bundle_header | 17 | from . import _get_bundle_header |
680 | 20 | from .v08 import BundleSerializerV08, BundleReader | 18 | from .v08 import BundleSerializerV08, BundleReader |
681 | 21 | from ..bundle_data import BundleInfo | 19 | from ..bundle_data import BundleInfo |
682 | 22 | 20 | ||
683 | === modified file 'breezy/bzr/bundle/serializer/v4.py' | |||
684 | --- breezy/bzr/bundle/serializer/v4.py 2020-02-13 23:57:28 +0000 | |||
685 | +++ breezy/bzr/bundle/serializer/v4.py 2020-02-18 05:49:35 +0000 | |||
686 | @@ -14,8 +14,6 @@ | |||
687 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
688 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
689 | 16 | 16 | ||
690 | 17 | from __future__ import absolute_import | ||
691 | 18 | |||
692 | 19 | import bz2 | 17 | import bz2 |
693 | 20 | from io import ( | 18 | from io import ( |
694 | 21 | BytesIO, | 19 | BytesIO, |
695 | 22 | 20 | ||
696 | === modified file 'breezy/bzr/bzrdir.py' | |||
697 | --- breezy/bzr/bzrdir.py 2020-02-07 02:14:30 +0000 | |||
698 | +++ breezy/bzr/bzrdir.py 2020-02-18 05:49:35 +0000 | |||
699 | @@ -25,8 +25,6 @@ | |||
700 | 25 | objects returned. | 25 | objects returned. |
701 | 26 | """ | 26 | """ |
702 | 27 | 27 | ||
703 | 28 | from __future__ import absolute_import | ||
704 | 29 | |||
705 | 30 | import sys | 28 | import sys |
706 | 31 | 29 | ||
707 | 32 | from ..lazy_import import lazy_import | 30 | from ..lazy_import import lazy_import |
708 | 33 | 31 | ||
709 | === modified file 'breezy/bzr/check.py' | |||
710 | --- breezy/bzr/check.py 2020-02-07 02:14:30 +0000 | |||
711 | +++ breezy/bzr/check.py 2020-02-18 05:49:35 +0000 | |||
712 | @@ -47,8 +47,6 @@ | |||
713 | 47 | indicating that the revision was found/not found. | 47 | indicating that the revision was found/not found. |
714 | 48 | """ | 48 | """ |
715 | 49 | 49 | ||
716 | 50 | from __future__ import absolute_import | ||
717 | 51 | |||
718 | 52 | from .. import ( | 50 | from .. import ( |
719 | 53 | ui, | 51 | ui, |
720 | 54 | ) | 52 | ) |
721 | 55 | 53 | ||
722 | === modified file 'breezy/bzr/chk_map.py' | |||
723 | --- breezy/bzr/chk_map.py 2020-02-07 02:14:30 +0000 | |||
724 | +++ breezy/bzr/chk_map.py 2020-02-18 05:49:35 +0000 | |||
725 | @@ -37,8 +37,6 @@ | |||
726 | 37 | 37 | ||
727 | 38 | """ | 38 | """ |
728 | 39 | 39 | ||
729 | 40 | from __future__ import absolute_import | ||
730 | 41 | |||
731 | 42 | import heapq | 40 | import heapq |
732 | 43 | import threading | 41 | import threading |
733 | 44 | 42 | ||
734 | 45 | 43 | ||
735 | === modified file 'breezy/bzr/chk_serializer.py' | |||
736 | --- breezy/bzr/chk_serializer.py 2020-02-07 02:14:30 +0000 | |||
737 | +++ breezy/bzr/chk_serializer.py 2020-02-18 05:49:35 +0000 | |||
738 | @@ -16,8 +16,6 @@ | |||
739 | 16 | 16 | ||
740 | 17 | """Serializer object for CHK based inventory storage.""" | 17 | """Serializer object for CHK based inventory storage.""" |
741 | 18 | 18 | ||
742 | 19 | from __future__ import absolute_import | ||
743 | 20 | |||
744 | 21 | from io import ( | 19 | from io import ( |
745 | 22 | BytesIO, | 20 | BytesIO, |
746 | 23 | ) | 21 | ) |
747 | 24 | 22 | ||
748 | === modified file 'breezy/bzr/debug_commands.py' | |||
749 | --- breezy/bzr/debug_commands.py 2020-02-07 02:14:30 +0000 | |||
750 | +++ breezy/bzr/debug_commands.py 2020-02-18 05:49:35 +0000 | |||
751 | @@ -16,8 +16,6 @@ | |||
752 | 16 | 16 | ||
753 | 17 | """Debug commands for the bzr formats.""" | 17 | """Debug commands for the bzr formats.""" |
754 | 18 | 18 | ||
755 | 19 | from __future__ import absolute_import | ||
756 | 20 | |||
757 | 21 | from io import BytesIO | 19 | from io import BytesIO |
758 | 22 | 20 | ||
759 | 23 | from .. import ( | 21 | from .. import ( |
760 | 24 | 22 | ||
761 | === modified file 'breezy/bzr/dirstate.py' | |||
762 | --- breezy/bzr/dirstate.py 2020-02-14 00:44:15 +0000 | |||
763 | +++ breezy/bzr/dirstate.py 2020-02-18 05:49:35 +0000 | |||
764 | @@ -218,8 +218,6 @@ | |||
765 | 218 | 218 | ||
766 | 219 | """ | 219 | """ |
767 | 220 | 220 | ||
768 | 221 | from __future__ import absolute_import | ||
769 | 222 | |||
770 | 223 | import bisect | 221 | import bisect |
771 | 224 | import contextlib | 222 | import contextlib |
772 | 225 | import errno | 223 | import errno |
773 | 226 | 224 | ||
774 | === modified file 'breezy/bzr/fetch.py' | |||
775 | --- breezy/bzr/fetch.py 2020-02-07 02:14:30 +0000 | |||
776 | +++ breezy/bzr/fetch.py 2020-02-18 05:49:35 +0000 | |||
777 | @@ -22,8 +22,6 @@ | |||
778 | 22 | branch. | 22 | branch. |
779 | 23 | """ | 23 | """ |
780 | 24 | 24 | ||
781 | 25 | from __future__ import absolute_import | ||
782 | 26 | |||
783 | 27 | import operator | 25 | import operator |
784 | 28 | 26 | ||
785 | 29 | from ..lazy_import import lazy_import | 27 | from ..lazy_import import lazy_import |
786 | 30 | 28 | ||
787 | === modified file 'breezy/bzr/fullhistory.py' | |||
788 | --- breezy/bzr/fullhistory.py 2020-01-18 04:16:23 +0000 | |||
789 | +++ breezy/bzr/fullhistory.py 2020-02-18 05:49:35 +0000 | |||
790 | @@ -16,8 +16,6 @@ | |||
791 | 16 | 16 | ||
792 | 17 | """Full history branch formats.""" | 17 | """Full history branch formats.""" |
793 | 18 | 18 | ||
794 | 19 | from __future__ import absolute_import | ||
795 | 20 | |||
796 | 21 | from .. import ( | 19 | from .. import ( |
797 | 22 | debug, | 20 | debug, |
798 | 23 | errors, | 21 | errors, |
799 | 24 | 22 | ||
800 | === modified file 'breezy/bzr/generate_ids.py' | |||
801 | --- breezy/bzr/generate_ids.py 2020-02-07 02:14:30 +0000 | |||
802 | +++ breezy/bzr/generate_ids.py 2020-02-18 05:49:35 +0000 | |||
803 | @@ -16,8 +16,6 @@ | |||
804 | 16 | 16 | ||
805 | 17 | """Common code for generating file or revision ids.""" | 17 | """Common code for generating file or revision ids.""" |
806 | 18 | 18 | ||
807 | 19 | from __future__ import absolute_import | ||
808 | 20 | |||
809 | 21 | from ..lazy_import import lazy_import | 19 | from ..lazy_import import lazy_import |
810 | 22 | lazy_import(globals(), """ | 20 | lazy_import(globals(), """ |
811 | 23 | import time | 21 | import time |
812 | 24 | 22 | ||
813 | === modified file 'breezy/bzr/groupcompress.py' | |||
814 | --- breezy/bzr/groupcompress.py 2020-02-13 23:57:28 +0000 | |||
815 | +++ breezy/bzr/groupcompress.py 2020-02-18 05:49:35 +0000 | |||
816 | @@ -16,8 +16,6 @@ | |||
817 | 16 | 16 | ||
818 | 17 | """Core compression logic for compressing streams of related files.""" | 17 | """Core compression logic for compressing streams of related files.""" |
819 | 18 | 18 | ||
820 | 19 | from __future__ import absolute_import | ||
821 | 20 | |||
822 | 21 | import time | 19 | import time |
823 | 22 | import zlib | 20 | import zlib |
824 | 23 | 21 | ||
825 | 24 | 22 | ||
826 | === modified file 'breezy/bzr/groupcompress_repo.py' | |||
827 | --- breezy/bzr/groupcompress_repo.py 2020-02-07 02:14:30 +0000 | |||
828 | +++ breezy/bzr/groupcompress_repo.py 2020-02-18 05:49:35 +0000 | |||
829 | @@ -16,8 +16,6 @@ | |||
830 | 16 | 16 | ||
831 | 17 | """Repository formats using CHK inventories and groupcompress compression.""" | 17 | """Repository formats using CHK inventories and groupcompress compression.""" |
832 | 18 | 18 | ||
833 | 19 | from __future__ import absolute_import | ||
834 | 20 | |||
835 | 21 | import time | 19 | import time |
836 | 22 | 20 | ||
837 | 23 | from .. import ( | 21 | from .. import ( |
838 | 24 | 22 | ||
839 | === modified file 'breezy/bzr/index.py' | |||
840 | --- breezy/bzr/index.py 2020-02-07 02:14:30 +0000 | |||
841 | +++ breezy/bzr/index.py 2020-02-18 05:49:35 +0000 | |||
842 | @@ -16,8 +16,6 @@ | |||
843 | 16 | 16 | ||
844 | 17 | """Indexing facilities.""" | 17 | """Indexing facilities.""" |
845 | 18 | 18 | ||
846 | 19 | from __future__ import absolute_import | ||
847 | 20 | |||
848 | 21 | __all__ = [ | 19 | __all__ = [ |
849 | 22 | 'CombinedGraphIndex', | 20 | 'CombinedGraphIndex', |
850 | 23 | 'GraphIndex', | 21 | 'GraphIndex', |
851 | 24 | 22 | ||
852 | === modified file 'breezy/bzr/inventory.py' | |||
853 | --- breezy/bzr/inventory.py 2020-02-07 02:14:30 +0000 | |||
854 | +++ breezy/bzr/inventory.py 2020-02-18 05:49:35 +0000 | |||
855 | @@ -23,8 +23,6 @@ | |||
856 | 23 | # But those depend on its position within a particular inventory, and | 23 | # But those depend on its position within a particular inventory, and |
857 | 24 | # it would be nice not to need to hold the backpointer here. | 24 | # it would be nice not to need to hold the backpointer here. |
858 | 25 | 25 | ||
859 | 26 | from __future__ import absolute_import | ||
860 | 27 | |||
861 | 28 | # This should really be an id randomly assigned when the tree is | 26 | # This should really be an id randomly assigned when the tree is |
862 | 29 | # created, but it's not for now. | 27 | # created, but it's not for now. |
863 | 30 | ROOT_ID = b"TREE_ROOT" | 28 | ROOT_ID = b"TREE_ROOT" |
864 | 31 | 29 | ||
865 | === modified file 'breezy/bzr/inventory_delta.py' | |||
866 | --- breezy/bzr/inventory_delta.py 2020-02-09 01:16:06 +0000 | |||
867 | +++ breezy/bzr/inventory_delta.py 2020-02-18 05:49:35 +0000 | |||
868 | @@ -22,8 +22,6 @@ | |||
869 | 22 | - InventoryDeltaSerializer - object to read/write inventory deltas. | 22 | - InventoryDeltaSerializer - object to read/write inventory deltas. |
870 | 23 | """ | 23 | """ |
871 | 24 | 24 | ||
872 | 25 | from __future__ import absolute_import | ||
873 | 26 | |||
874 | 27 | __all__ = ['InventoryDeltaSerializer'] | 25 | __all__ = ['InventoryDeltaSerializer'] |
875 | 28 | 26 | ||
876 | 29 | from .. import errors | 27 | from .. import errors |
877 | 30 | 28 | ||
878 | === modified file 'breezy/bzr/inventorytree.py' | |||
879 | --- breezy/bzr/inventorytree.py 2020-02-07 02:14:30 +0000 | |||
880 | +++ breezy/bzr/inventorytree.py 2020-02-18 05:49:35 +0000 | |||
881 | @@ -17,8 +17,6 @@ | |||
882 | 17 | """Tree classes, representing directory at point in time. | 17 | """Tree classes, representing directory at point in time. |
883 | 18 | """ | 18 | """ |
884 | 19 | 19 | ||
885 | 20 | from __future__ import absolute_import | ||
886 | 21 | |||
887 | 22 | import os | 20 | import os |
888 | 23 | import re | 21 | import re |
889 | 24 | 22 | ||
890 | 25 | 23 | ||
891 | === modified file 'breezy/bzr/knit.py' | |||
892 | --- breezy/bzr/knit.py 2020-02-07 02:14:30 +0000 | |||
893 | +++ breezy/bzr/knit.py 2020-02-18 05:49:35 +0000 | |||
894 | @@ -51,8 +51,6 @@ | |||
895 | 51 | 51 | ||
896 | 52 | """ | 52 | """ |
897 | 53 | 53 | ||
898 | 54 | from __future__ import absolute_import | ||
899 | 55 | |||
900 | 56 | import operator | 54 | import operator |
901 | 57 | from io import BytesIO | 55 | from io import BytesIO |
902 | 58 | import os | 56 | import os |
903 | 59 | 57 | ||
904 | === modified file 'breezy/bzr/knitpack_repo.py' | |||
905 | --- breezy/bzr/knitpack_repo.py 2020-02-13 23:57:28 +0000 | |||
906 | +++ breezy/bzr/knitpack_repo.py 2020-02-18 05:49:35 +0000 | |||
907 | @@ -16,8 +16,6 @@ | |||
908 | 16 | 16 | ||
909 | 17 | """Knit-based pack repository formats.""" | 17 | """Knit-based pack repository formats.""" |
910 | 18 | 18 | ||
911 | 19 | from __future__ import absolute_import | ||
912 | 20 | |||
913 | 21 | from .. import ( | 19 | from .. import ( |
914 | 22 | errors, | 20 | errors, |
915 | 23 | ) | 21 | ) |
916 | 24 | 22 | ||
917 | === modified file 'breezy/bzr/knitrepo.py' | |||
918 | --- breezy/bzr/knitrepo.py 2020-01-11 17:50:28 +0000 | |||
919 | +++ breezy/bzr/knitrepo.py 2020-02-18 05:49:35 +0000 | |||
920 | @@ -14,8 +14,6 @@ | |||
921 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
922 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
923 | 16 | 16 | ||
924 | 17 | from __future__ import absolute_import | ||
925 | 18 | |||
926 | 19 | from ..lazy_import import lazy_import | 17 | from ..lazy_import import lazy_import |
927 | 20 | lazy_import(globals(), """ | 18 | lazy_import(globals(), """ |
928 | 21 | import itertools | 19 | import itertools |
929 | 22 | 20 | ||
930 | === modified file 'breezy/bzr/pack.py' | |||
931 | --- breezy/bzr/pack.py 2020-02-13 23:57:28 +0000 | |||
932 | +++ breezy/bzr/pack.py 2020-02-18 05:49:35 +0000 | |||
933 | @@ -20,8 +20,6 @@ | |||
934 | 20 | doc/developers/container-format.txt. | 20 | doc/developers/container-format.txt. |
935 | 21 | """ | 21 | """ |
936 | 22 | 22 | ||
937 | 23 | from __future__ import absolute_import | ||
938 | 24 | |||
939 | 25 | from io import BytesIO | 23 | from io import BytesIO |
940 | 26 | import re | 24 | import re |
941 | 27 | 25 | ||
942 | 28 | 26 | ||
943 | === modified file 'breezy/bzr/pack_repo.py' | |||
944 | --- breezy/bzr/pack_repo.py 2020-02-13 23:57:28 +0000 | |||
945 | +++ breezy/bzr/pack_repo.py 2020-02-18 05:49:35 +0000 | |||
946 | @@ -14,8 +14,6 @@ | |||
947 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
948 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
949 | 16 | 16 | ||
950 | 17 | from __future__ import absolute_import | ||
951 | 18 | |||
952 | 19 | import re | 17 | import re |
953 | 20 | import sys | 18 | import sys |
954 | 21 | 19 | ||
955 | 22 | 20 | ||
956 | === modified file 'breezy/bzr/reconcile.py' | |||
957 | --- breezy/bzr/reconcile.py 2020-02-07 02:14:30 +0000 | |||
958 | +++ breezy/bzr/reconcile.py 2020-02-18 05:49:35 +0000 | |||
959 | @@ -16,8 +16,6 @@ | |||
960 | 16 | 16 | ||
961 | 17 | """Reconcilers are able to fix some potential data errors in a branch.""" | 17 | """Reconcilers are able to fix some potential data errors in a branch.""" |
962 | 18 | 18 | ||
963 | 19 | from __future__ import absolute_import | ||
964 | 20 | |||
965 | 21 | __all__ = [ | 19 | __all__ = [ |
966 | 22 | 'BranchReconciler', | 20 | 'BranchReconciler', |
967 | 23 | 'KnitReconciler', | 21 | 'KnitReconciler', |
968 | 24 | 22 | ||
969 | === modified file 'breezy/bzr/remote.py' | |||
970 | --- breezy/bzr/remote.py 2020-02-13 23:57:28 +0000 | |||
971 | +++ breezy/bzr/remote.py 2020-02-18 05:49:35 +0000 | |||
972 | @@ -14,8 +14,6 @@ | |||
973 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
974 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
975 | 16 | 16 | ||
976 | 17 | from __future__ import absolute_import | ||
977 | 18 | |||
978 | 19 | import bz2 | 17 | import bz2 |
979 | 20 | import os | 18 | import os |
980 | 21 | import re | 19 | import re |
981 | 22 | 20 | ||
982 | === modified file 'breezy/bzr/repository.py' | |||
983 | --- breezy/bzr/repository.py 2020-02-07 02:14:30 +0000 | |||
984 | +++ breezy/bzr/repository.py 2020-02-18 05:49:35 +0000 | |||
985 | @@ -14,8 +14,6 @@ | |||
986 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
987 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
988 | 16 | 16 | ||
989 | 17 | from __future__ import absolute_import | ||
990 | 18 | |||
991 | 19 | import itertools | 17 | import itertools |
992 | 20 | 18 | ||
993 | 21 | from . import ( | 19 | from . import ( |
994 | 22 | 20 | ||
995 | === modified file 'breezy/bzr/serializer.py' | |||
996 | --- breezy/bzr/serializer.py 2020-01-31 10:39:02 +0000 | |||
997 | +++ breezy/bzr/serializer.py 2020-02-18 05:49:35 +0000 | |||
998 | @@ -16,8 +16,6 @@ | |||
999 | 16 | 16 | ||
1000 | 17 | """Inventory/revision serialization.""" | 17 | """Inventory/revision serialization.""" |
1001 | 18 | 18 | ||
1002 | 19 | from __future__ import absolute_import | ||
1003 | 20 | |||
1004 | 21 | from .. import registry | 19 | from .. import registry |
1005 | 22 | 20 | ||
1006 | 23 | 21 | ||
1007 | 24 | 22 | ||
1008 | === modified file 'breezy/bzr/smart/__init__.py' | |||
1009 | --- breezy/bzr/smart/__init__.py 2018-11-10 17:52:47 +0000 | |||
1010 | +++ breezy/bzr/smart/__init__.py 2020-02-18 05:49:35 +0000 | |||
1011 | @@ -33,8 +33,6 @@ | |||
1012 | 33 | 33 | ||
1013 | 34 | """ | 34 | """ |
1014 | 35 | 35 | ||
1015 | 36 | from __future__ import absolute_import | ||
1016 | 37 | |||
1017 | 38 | # TODO: A plain integer from query_version is too simple; should give some | 36 | # TODO: A plain integer from query_version is too simple; should give some |
1018 | 39 | # capabilities too? | 37 | # capabilities too? |
1019 | 40 | 38 | ||
1020 | 41 | 39 | ||
1021 | === modified file 'breezy/bzr/smart/branch.py' | |||
1022 | --- breezy/bzr/smart/branch.py 2020-02-07 02:14:30 +0000 | |||
1023 | +++ breezy/bzr/smart/branch.py 2020-02-18 05:49:35 +0000 | |||
1024 | @@ -16,8 +16,6 @@ | |||
1025 | 16 | 16 | ||
1026 | 17 | """Server-side branch related request implmentations.""" | 17 | """Server-side branch related request implmentations.""" |
1027 | 18 | 18 | ||
1028 | 19 | from __future__ import absolute_import | ||
1029 | 20 | |||
1030 | 21 | from ... import ( | 19 | from ... import ( |
1031 | 22 | bencode, | 20 | bencode, |
1032 | 23 | errors, | 21 | errors, |
1033 | 24 | 22 | ||
1034 | === modified file 'breezy/bzr/smart/bzrdir.py' | |||
1035 | --- breezy/bzr/smart/bzrdir.py 2020-02-07 02:14:30 +0000 | |||
1036 | +++ breezy/bzr/smart/bzrdir.py 2020-02-18 05:49:35 +0000 | |||
1037 | @@ -16,8 +16,6 @@ | |||
1038 | 16 | 16 | ||
1039 | 17 | """Server-side bzrdir related request implmentations.""" | 17 | """Server-side bzrdir related request implmentations.""" |
1040 | 18 | 18 | ||
1041 | 19 | from __future__ import absolute_import | ||
1042 | 20 | |||
1043 | 21 | from ... import ( | 19 | from ... import ( |
1044 | 22 | bencode, | 20 | bencode, |
1045 | 23 | branch, | 21 | branch, |
1046 | 24 | 22 | ||
1047 | === modified file 'breezy/bzr/smart/client.py' | |||
1048 | --- breezy/bzr/smart/client.py 2018-11-11 04:08:32 +0000 | |||
1049 | +++ breezy/bzr/smart/client.py 2020-02-18 05:49:35 +0000 | |||
1050 | @@ -14,8 +14,6 @@ | |||
1051 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1052 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1053 | 16 | 16 | ||
1054 | 17 | from __future__ import absolute_import | ||
1055 | 18 | |||
1056 | 19 | from ... import lazy_import | 17 | from ... import lazy_import |
1057 | 20 | lazy_import.lazy_import(globals(), """ | 18 | lazy_import.lazy_import(globals(), """ |
1058 | 21 | from breezy.bzr.smart import request as _mod_request | 19 | from breezy.bzr.smart import request as _mod_request |
1059 | 22 | 20 | ||
1060 | === modified file 'breezy/bzr/smart/medium.py' | |||
1061 | --- breezy/bzr/smart/medium.py 2019-07-28 22:59:46 +0000 | |||
1062 | +++ breezy/bzr/smart/medium.py 2020-02-18 05:49:35 +0000 | |||
1063 | @@ -24,8 +24,6 @@ | |||
1064 | 24 | breezy/transport/smart/__init__.py. | 24 | breezy/transport/smart/__init__.py. |
1065 | 25 | """ | 25 | """ |
1066 | 26 | 26 | ||
1067 | 27 | from __future__ import absolute_import | ||
1068 | 28 | |||
1069 | 29 | import errno | 27 | import errno |
1070 | 30 | import io | 28 | import io |
1071 | 31 | import os | 29 | import os |
1072 | 32 | 30 | ||
1073 | === modified file 'breezy/bzr/smart/message.py' | |||
1074 | --- breezy/bzr/smart/message.py 2020-02-07 02:14:30 +0000 | |||
1075 | +++ breezy/bzr/smart/message.py 2020-02-18 05:49:35 +0000 | |||
1076 | @@ -14,8 +14,6 @@ | |||
1077 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1078 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1079 | 16 | 16 | ||
1080 | 17 | from __future__ import absolute_import | ||
1081 | 18 | |||
1082 | 19 | try: | 17 | try: |
1083 | 20 | from collections.abc import deque | 18 | from collections.abc import deque |
1084 | 21 | except ImportError: # python < 3.7 | 19 | except ImportError: # python < 3.7 |
1085 | 22 | 20 | ||
1086 | === modified file 'breezy/bzr/smart/packrepository.py' | |||
1087 | --- breezy/bzr/smart/packrepository.py 2018-11-11 04:08:32 +0000 | |||
1088 | +++ breezy/bzr/smart/packrepository.py 2020-02-18 05:49:35 +0000 | |||
1089 | @@ -14,8 +14,6 @@ | |||
1090 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1091 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1092 | 16 | 16 | ||
1093 | 17 | from __future__ import absolute_import | ||
1094 | 18 | |||
1095 | 19 | """Server-side pack repository related request implmentations.""" | 17 | """Server-side pack repository related request implmentations.""" |
1096 | 20 | 18 | ||
1097 | 21 | from .request import ( | 19 | from .request import ( |
1098 | 22 | 20 | ||
1099 | === modified file 'breezy/bzr/smart/ping.py' | |||
1100 | --- breezy/bzr/smart/ping.py 2020-02-07 02:14:30 +0000 | |||
1101 | +++ breezy/bzr/smart/ping.py 2020-02-18 05:49:35 +0000 | |||
1102 | @@ -16,8 +16,6 @@ | |||
1103 | 16 | 16 | ||
1104 | 17 | """Ping plugin for brz.""" | 17 | """Ping plugin for brz.""" |
1105 | 18 | 18 | ||
1106 | 19 | from __future__ import absolute_import | ||
1107 | 20 | |||
1108 | 21 | from ...commands import Command | 19 | from ...commands import Command |
1109 | 22 | from ...lazy_import import lazy_import | 20 | from ...lazy_import import lazy_import |
1110 | 23 | 21 | ||
1111 | 24 | 22 | ||
1112 | === modified file 'breezy/bzr/smart/protocol.py' | |||
1113 | --- breezy/bzr/smart/protocol.py 2020-02-07 02:14:30 +0000 | |||
1114 | +++ breezy/bzr/smart/protocol.py 2020-02-18 05:49:35 +0000 | |||
1115 | @@ -18,8 +18,6 @@ | |||
1116 | 18 | client and server. | 18 | client and server. |
1117 | 19 | """ | 19 | """ |
1118 | 20 | 20 | ||
1119 | 21 | from __future__ import absolute_import | ||
1120 | 22 | |||
1121 | 23 | try: | 21 | try: |
1122 | 24 | from collections.abc import deque | 22 | from collections.abc import deque |
1123 | 25 | except ImportError: # python < 3.7 | 23 | except ImportError: # python < 3.7 |
1124 | 26 | 24 | ||
1125 | === modified file 'breezy/bzr/smart/repository.py' | |||
1126 | --- breezy/bzr/smart/repository.py 2020-02-07 02:14:30 +0000 | |||
1127 | +++ breezy/bzr/smart/repository.py 2020-02-18 05:49:35 +0000 | |||
1128 | @@ -16,8 +16,6 @@ | |||
1129 | 16 | 16 | ||
1130 | 17 | """Server-side repository related request implementations.""" | 17 | """Server-side repository related request implementations.""" |
1131 | 18 | 18 | ||
1132 | 19 | from __future__ import absolute_import | ||
1133 | 20 | |||
1134 | 21 | import bz2 | 19 | import bz2 |
1135 | 22 | import itertools | 20 | import itertools |
1136 | 23 | import os | 21 | import os |
1137 | 24 | 22 | ||
1138 | === modified file 'breezy/bzr/smart/request.py' | |||
1139 | --- breezy/bzr/smart/request.py 2020-02-07 02:14:30 +0000 | |||
1140 | +++ breezy/bzr/smart/request.py 2020-02-18 05:49:35 +0000 | |||
1141 | @@ -26,8 +26,6 @@ | |||
1142 | 26 | of times during a request). | 26 | of times during a request). |
1143 | 27 | """ | 27 | """ |
1144 | 28 | 28 | ||
1145 | 29 | from __future__ import absolute_import | ||
1146 | 30 | |||
1147 | 31 | # XXX: The class names are a little confusing: the protocol will instantiate a | 29 | # XXX: The class names are a little confusing: the protocol will instantiate a |
1148 | 32 | # SmartServerRequestHandler, whose dispatch_command method creates an instance | 30 | # SmartServerRequestHandler, whose dispatch_command method creates an instance |
1149 | 33 | # of a SmartServerRequest subclass. | 31 | # of a SmartServerRequest subclass. |
1150 | 34 | 32 | ||
1151 | === modified file 'breezy/bzr/smart/server.py' | |||
1152 | --- breezy/bzr/smart/server.py 2020-02-07 02:14:30 +0000 | |||
1153 | +++ breezy/bzr/smart/server.py 2020-02-18 05:49:35 +0000 | |||
1154 | @@ -16,8 +16,6 @@ | |||
1155 | 16 | 16 | ||
1156 | 17 | """Server for smart-server protocol.""" | 17 | """Server for smart-server protocol.""" |
1157 | 18 | 18 | ||
1158 | 19 | from __future__ import absolute_import | ||
1159 | 20 | |||
1160 | 21 | import errno | 19 | import errno |
1161 | 22 | import os.path | 20 | import os.path |
1162 | 23 | import socket | 21 | import socket |
1163 | 24 | 22 | ||
1164 | === modified file 'breezy/bzr/smart/signals.py' | |||
1165 | --- breezy/bzr/smart/signals.py 2018-11-11 04:08:32 +0000 | |||
1166 | +++ breezy/bzr/smart/signals.py 2020-02-18 05:49:35 +0000 | |||
1167 | @@ -16,8 +16,6 @@ | |||
1168 | 16 | 16 | ||
1169 | 17 | """Signal handling for the smart server code.""" | 17 | """Signal handling for the smart server code.""" |
1170 | 18 | 18 | ||
1171 | 19 | from __future__ import absolute_import | ||
1172 | 20 | |||
1173 | 21 | import signal | 19 | import signal |
1174 | 22 | import weakref | 20 | import weakref |
1175 | 23 | 21 | ||
1176 | 24 | 22 | ||
1177 | === modified file 'breezy/bzr/smart/vfs.py' | |||
1178 | --- breezy/bzr/smart/vfs.py 2018-11-17 16:53:10 +0000 | |||
1179 | +++ breezy/bzr/smart/vfs.py 2020-02-18 05:49:35 +0000 | |||
1180 | @@ -24,8 +24,6 @@ | |||
1181 | 24 | protocol, as implemented in bzr 0.11 and later. | 24 | protocol, as implemented in bzr 0.11 and later. |
1182 | 25 | """ | 25 | """ |
1183 | 26 | 26 | ||
1184 | 27 | from __future__ import absolute_import | ||
1185 | 28 | |||
1186 | 29 | import os | 27 | import os |
1187 | 30 | 28 | ||
1188 | 31 | from ... import urlutils | 29 | from ... import urlutils |
1189 | 32 | 30 | ||
1190 | === modified file 'breezy/bzr/testament.py' | |||
1191 | --- breezy/bzr/testament.py 2020-02-07 02:14:30 +0000 | |||
1192 | +++ breezy/bzr/testament.py 2020-02-18 05:49:35 +0000 | |||
1193 | @@ -59,8 +59,6 @@ | |||
1194 | 59 | * the testament uses unix line-endings (\n) | 59 | * the testament uses unix line-endings (\n) |
1195 | 60 | """ | 60 | """ |
1196 | 61 | 61 | ||
1197 | 62 | from __future__ import absolute_import | ||
1198 | 63 | |||
1199 | 64 | # XXX: At the moment, clients trust that the graph described in a weave | 62 | # XXX: At the moment, clients trust that the graph described in a weave |
1200 | 65 | # is accurate, but that's not covered by the testament. Perhaps the best | 63 | # is accurate, but that's not covered by the testament. Perhaps the best |
1201 | 66 | # fix is when verifying a revision to make sure that every file mentioned | 64 | # fix is when verifying a revision to make sure that every file mentioned |
1202 | 67 | 65 | ||
1203 | === modified file 'breezy/bzr/textinv.py' | |||
1204 | --- breezy/bzr/textinv.py 2018-11-11 04:08:32 +0000 | |||
1205 | +++ breezy/bzr/textinv.py 2020-02-18 05:49:35 +0000 | |||
1206 | @@ -14,8 +14,6 @@ | |||
1207 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1208 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1209 | 16 | 16 | ||
1210 | 17 | from __future__ import absolute_import | ||
1211 | 18 | |||
1212 | 19 | from .errors import BzrError | 17 | from .errors import BzrError |
1213 | 20 | from .inventory import Inventory | 18 | from .inventory import Inventory |
1214 | 21 | 19 | ||
1215 | 22 | 20 | ||
1216 | === modified file 'breezy/bzr/versionedfile.py' | |||
1217 | --- breezy/bzr/versionedfile.py 2020-02-13 23:57:28 +0000 | |||
1218 | +++ breezy/bzr/versionedfile.py 2020-02-18 05:49:35 +0000 | |||
1219 | @@ -16,8 +16,6 @@ | |||
1220 | 16 | 16 | ||
1221 | 17 | """Versioned text file storage api.""" | 17 | """Versioned text file storage api.""" |
1222 | 18 | 18 | ||
1223 | 19 | from __future__ import absolute_import | ||
1224 | 20 | |||
1225 | 21 | from copy import copy | 19 | from copy import copy |
1226 | 22 | from io import BytesIO | 20 | from io import BytesIO |
1227 | 23 | import itertools | 21 | import itertools |
1228 | 24 | 22 | ||
1229 | === modified file 'breezy/bzr/vf_repository.py' | |||
1230 | --- breezy/bzr/vf_repository.py 2020-02-13 23:57:28 +0000 | |||
1231 | +++ breezy/bzr/vf_repository.py 2020-02-18 05:49:35 +0000 | |||
1232 | @@ -16,8 +16,6 @@ | |||
1233 | 16 | 16 | ||
1234 | 17 | """Repository formats built around versioned files.""" | 17 | """Repository formats built around versioned files.""" |
1235 | 18 | 18 | ||
1236 | 19 | from __future__ import absolute_import | ||
1237 | 20 | |||
1238 | 21 | from io import BytesIO | 19 | from io import BytesIO |
1239 | 22 | 20 | ||
1240 | 23 | from ..lazy_import import lazy_import | 21 | from ..lazy_import import lazy_import |
1241 | 24 | 22 | ||
1242 | === modified file 'breezy/bzr/vf_search.py' | |||
1243 | --- breezy/bzr/vf_search.py 2020-02-07 02:14:30 +0000 | |||
1244 | +++ breezy/bzr/vf_search.py 2020-02-18 05:49:35 +0000 | |||
1245 | @@ -16,8 +16,6 @@ | |||
1246 | 16 | 16 | ||
1247 | 17 | """Searching in versioned file repositories.""" | 17 | """Searching in versioned file repositories.""" |
1248 | 18 | 18 | ||
1249 | 19 | from __future__ import absolute_import | ||
1250 | 20 | |||
1251 | 21 | import itertools | 19 | import itertools |
1252 | 22 | 20 | ||
1253 | 23 | from .. import ( | 21 | from .. import ( |
1254 | 24 | 22 | ||
1255 | === modified file 'breezy/bzr/weave.py' | |||
1256 | --- breezy/bzr/weave.py 2020-02-07 02:14:30 +0000 | |||
1257 | +++ breezy/bzr/weave.py 2020-02-18 05:49:35 +0000 | |||
1258 | @@ -18,8 +18,6 @@ | |||
1259 | 18 | 18 | ||
1260 | 19 | """Weave - storage of related text file versions""" | 19 | """Weave - storage of related text file versions""" |
1261 | 20 | 20 | ||
1262 | 21 | from __future__ import absolute_import | ||
1263 | 22 | |||
1264 | 23 | # XXX: If we do weaves this way, will a merge still behave the same | 21 | # XXX: If we do weaves this way, will a merge still behave the same |
1265 | 24 | # way if it's done in a different order? That's a pretty desirable | 22 | # way if it's done in a different order? That's a pretty desirable |
1266 | 25 | # property. | 23 | # property. |
1267 | 26 | 24 | ||
1268 | === modified file 'breezy/bzr/weavefile.py' | |||
1269 | --- breezy/bzr/weavefile.py 2020-02-07 02:14:30 +0000 | |||
1270 | +++ breezy/bzr/weavefile.py 2020-02-18 05:49:35 +0000 | |||
1271 | @@ -34,8 +34,6 @@ | |||
1272 | 34 | line contains a newline, or ',' if not. | 34 | line contains a newline, or ',' if not. |
1273 | 35 | """ | 35 | """ |
1274 | 36 | 36 | ||
1275 | 37 | from __future__ import absolute_import | ||
1276 | 38 | |||
1277 | 39 | # TODO: When extracting a single version it'd be enough to just pass | 37 | # TODO: When extracting a single version it'd be enough to just pass |
1278 | 40 | # an iterator returning the weave lines... We don't really need to | 38 | # an iterator returning the weave lines... We don't really need to |
1279 | 41 | # deserialize it into memory. | 39 | # deserialize it into memory. |
1280 | 42 | 40 | ||
1281 | === modified file 'breezy/bzr/workingtree.py' | |||
1282 | --- breezy/bzr/workingtree.py 2020-02-07 02:14:30 +0000 | |||
1283 | +++ breezy/bzr/workingtree.py 2020-02-18 05:49:35 +0000 | |||
1284 | @@ -30,8 +30,6 @@ | |||
1285 | 30 | """ | 30 | """ |
1286 | 31 | 31 | ||
1287 | 32 | 32 | ||
1288 | 33 | from __future__ import absolute_import | ||
1289 | 34 | |||
1290 | 35 | from bisect import bisect_left | 33 | from bisect import bisect_left |
1291 | 36 | import breezy | 34 | import breezy |
1292 | 37 | try: | 35 | try: |
1293 | 38 | 36 | ||
1294 | === modified file 'breezy/bzr/workingtree_3.py' | |||
1295 | --- breezy/bzr/workingtree_3.py 2019-06-29 13:16:26 +0000 | |||
1296 | +++ breezy/bzr/workingtree_3.py 2020-02-18 05:49:35 +0000 | |||
1297 | @@ -18,8 +18,6 @@ | |||
1298 | 18 | 18 | ||
1299 | 19 | """ | 19 | """ |
1300 | 20 | 20 | ||
1301 | 21 | from __future__ import absolute_import | ||
1302 | 22 | |||
1303 | 23 | import errno | 21 | import errno |
1304 | 24 | 22 | ||
1305 | 25 | from . import ( | 23 | from . import ( |
1306 | 26 | 24 | ||
1307 | === modified file 'breezy/bzr/workingtree_4.py' | |||
1308 | --- breezy/bzr/workingtree_4.py 2020-02-13 23:57:28 +0000 | |||
1309 | +++ breezy/bzr/workingtree_4.py 2020-02-18 05:49:35 +0000 | |||
1310 | @@ -22,8 +22,6 @@ | |||
1311 | 22 | WorkingTree.open(dir). | 22 | WorkingTree.open(dir). |
1312 | 23 | """ | 23 | """ |
1313 | 24 | 24 | ||
1314 | 25 | from __future__ import absolute_import | ||
1315 | 26 | |||
1316 | 27 | from io import BytesIO | 25 | from io import BytesIO |
1317 | 28 | import os | 26 | import os |
1318 | 29 | 27 | ||
1319 | 30 | 28 | ||
1320 | === modified file 'breezy/bzr/xml5.py' | |||
1321 | --- breezy/bzr/xml5.py 2020-01-31 02:49:47 +0000 | |||
1322 | +++ breezy/bzr/xml5.py 2020-02-18 05:49:35 +0000 | |||
1323 | @@ -14,8 +14,6 @@ | |||
1324 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1325 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1326 | 16 | 16 | ||
1327 | 17 | from __future__ import absolute_import | ||
1328 | 18 | |||
1329 | 19 | from .. import ( | 17 | from .. import ( |
1330 | 20 | cache_utf8, | 18 | cache_utf8, |
1331 | 21 | errors, | 19 | errors, |
1332 | 22 | 20 | ||
1333 | === modified file 'breezy/bzr/xml6.py' | |||
1334 | --- breezy/bzr/xml6.py 2018-05-13 02:18:13 +0000 | |||
1335 | +++ breezy/bzr/xml6.py 2020-02-18 05:49:35 +0000 | |||
1336 | @@ -14,8 +14,6 @@ | |||
1337 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1338 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1339 | 16 | 16 | ||
1340 | 17 | from __future__ import absolute_import | ||
1341 | 18 | |||
1342 | 19 | from . import xml8 | 17 | from . import xml8 |
1343 | 20 | 18 | ||
1344 | 21 | 19 | ||
1345 | 22 | 20 | ||
1346 | === modified file 'breezy/bzr/xml7.py' | |||
1347 | --- breezy/bzr/xml7.py 2018-11-10 17:52:47 +0000 | |||
1348 | +++ breezy/bzr/xml7.py 2020-02-18 05:49:35 +0000 | |||
1349 | @@ -14,8 +14,6 @@ | |||
1350 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1351 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1352 | 16 | 16 | ||
1353 | 17 | from __future__ import absolute_import | ||
1354 | 18 | |||
1355 | 19 | from . import ( | 17 | from . import ( |
1356 | 20 | xml6, | 18 | xml6, |
1357 | 21 | ) | 19 | ) |
1358 | 22 | 20 | ||
1359 | === modified file 'breezy/bzr/xml8.py' | |||
1360 | --- breezy/bzr/xml8.py 2020-02-07 02:14:30 +0000 | |||
1361 | +++ breezy/bzr/xml8.py 2020-02-18 05:49:35 +0000 | |||
1362 | @@ -14,8 +14,6 @@ | |||
1363 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1364 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1365 | 16 | 16 | ||
1366 | 17 | from __future__ import absolute_import | ||
1367 | 18 | |||
1368 | 19 | from io import BytesIO | 17 | from io import BytesIO |
1369 | 20 | 18 | ||
1370 | 21 | from .. import ( | 19 | from .. import ( |
1371 | 22 | 20 | ||
1372 | === modified file 'breezy/bzr/xml_serializer.py' | |||
1373 | --- breezy/bzr/xml_serializer.py 2020-02-07 02:14:30 +0000 | |||
1374 | +++ breezy/bzr/xml_serializer.py 2020-02-18 05:49:35 +0000 | |||
1375 | @@ -16,8 +16,6 @@ | |||
1376 | 16 | 16 | ||
1377 | 17 | """XML externalization support.""" | 17 | """XML externalization support.""" |
1378 | 18 | 18 | ||
1379 | 19 | from __future__ import absolute_import | ||
1380 | 20 | |||
1381 | 21 | # "XML is like violence: if it doesn't solve your problem, you aren't | 19 | # "XML is like violence: if it doesn't solve your problem, you aren't |
1382 | 22 | # using enough of it." -- various | 20 | # using enough of it." -- various |
1383 | 23 | 21 | ||
1384 | 24 | 22 | ||
1385 | === modified file 'breezy/bzr_distutils.py' | |||
1386 | --- breezy/bzr_distutils.py 2018-11-11 04:08:32 +0000 | |||
1387 | +++ breezy/bzr_distutils.py 2020-02-18 05:49:35 +0000 | |||
1388 | @@ -20,8 +20,6 @@ | |||
1389 | 20 | 20 | ||
1390 | 21 | """build_mo command for setup.py""" | 21 | """build_mo command for setup.py""" |
1391 | 22 | 22 | ||
1392 | 23 | from __future__ import absolute_import | ||
1393 | 24 | |||
1394 | 25 | from distutils import log | 23 | from distutils import log |
1395 | 26 | from distutils.core import Command | 24 | from distutils.core import Command |
1396 | 27 | from distutils.dep_util import newer | 25 | from distutils.dep_util import newer |
1397 | 28 | 26 | ||
1398 | === modified file 'breezy/cache_utf8.py' | |||
1399 | --- breezy/cache_utf8.py 2018-11-11 04:08:32 +0000 | |||
1400 | +++ breezy/cache_utf8.py 2020-02-18 05:49:35 +0000 | |||
1401 | @@ -19,8 +19,6 @@ | |||
1402 | 19 | 19 | ||
1403 | 20 | """Some functions to enable caching the conversion between unicode to utf8""" | 20 | """Some functions to enable caching the conversion between unicode to utf8""" |
1404 | 21 | 21 | ||
1405 | 22 | from __future__ import absolute_import | ||
1406 | 23 | |||
1407 | 24 | import codecs | 22 | import codecs |
1408 | 25 | 23 | ||
1409 | 26 | _utf8_encode = codecs.utf_8_encode | 24 | _utf8_encode = codecs.utf_8_encode |
1410 | 27 | 25 | ||
1411 | === modified file 'breezy/cethread.py' | |||
1412 | --- breezy/cethread.py 2020-02-07 02:14:30 +0000 | |||
1413 | +++ breezy/cethread.py 2020-02-18 05:49:35 +0000 | |||
1414 | @@ -14,8 +14,6 @@ | |||
1415 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1416 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1417 | 16 | 16 | ||
1418 | 17 | from __future__ import absolute_import | ||
1419 | 18 | |||
1420 | 19 | import sys | 17 | import sys |
1421 | 20 | import threading | 18 | import threading |
1422 | 21 | 19 | ||
1423 | 22 | 20 | ||
1424 | === modified file 'breezy/check.py' | |||
1425 | --- breezy/check.py 2020-02-07 02:14:30 +0000 | |||
1426 | +++ breezy/check.py 2020-02-18 05:49:35 +0000 | |||
1427 | @@ -34,8 +34,6 @@ | |||
1428 | 34 | indicating that the revision was found/not found. | 34 | indicating that the revision was found/not found. |
1429 | 35 | """ | 35 | """ |
1430 | 36 | 36 | ||
1431 | 37 | from __future__ import absolute_import | ||
1432 | 38 | |||
1433 | 39 | import contextlib | 37 | import contextlib |
1434 | 40 | 38 | ||
1435 | 41 | from . import ( | 39 | from . import ( |
1436 | 42 | 40 | ||
1437 | === modified file 'breezy/chunk_writer.py' | |||
1438 | --- breezy/chunk_writer.py 2018-11-12 01:41:38 +0000 | |||
1439 | +++ breezy/chunk_writer.py 2020-02-18 05:49:35 +0000 | |||
1440 | @@ -17,8 +17,6 @@ | |||
1441 | 17 | 17 | ||
1442 | 18 | """ChunkWriter: write compressed data out with a fixed upper bound.""" | 18 | """ChunkWriter: write compressed data out with a fixed upper bound.""" |
1443 | 19 | 19 | ||
1444 | 20 | from __future__ import absolute_import | ||
1445 | 21 | |||
1446 | 22 | import zlib | 20 | import zlib |
1447 | 23 | from zlib import Z_FINISH, Z_SYNC_FLUSH | 21 | from zlib import Z_FINISH, Z_SYNC_FLUSH |
1448 | 24 | 22 | ||
1449 | 25 | 23 | ||
1450 | === modified file 'breezy/clean_tree.py' | |||
1451 | --- breezy/clean_tree.py 2018-11-11 04:08:32 +0000 | |||
1452 | +++ breezy/clean_tree.py 2020-02-18 05:49:35 +0000 | |||
1453 | @@ -14,8 +14,6 @@ | |||
1454 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1455 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1456 | 16 | 16 | ||
1457 | 17 | from __future__ import absolute_import | ||
1458 | 18 | |||
1459 | 19 | import errno | 17 | import errno |
1460 | 20 | import os | 18 | import os |
1461 | 21 | import shutil | 19 | import shutil |
1462 | 22 | 20 | ||
1463 | === modified file 'breezy/cmd_test_script.py' | |||
1464 | --- breezy/cmd_test_script.py 2018-11-11 04:08:32 +0000 | |||
1465 | +++ breezy/cmd_test_script.py 2020-02-18 05:49:35 +0000 | |||
1466 | @@ -20,8 +20,6 @@ | |||
1467 | 20 | This module should be importable even if testtools aren't available. | 20 | This module should be importable even if testtools aren't available. |
1468 | 21 | """ | 21 | """ |
1469 | 22 | 22 | ||
1470 | 23 | from __future__ import absolute_import | ||
1471 | 24 | |||
1472 | 25 | import os | 23 | import os |
1473 | 26 | 24 | ||
1474 | 27 | from . import ( | 25 | from . import ( |
1475 | 28 | 26 | ||
1476 | === modified file 'breezy/cmd_version_info.py' | |||
1477 | --- breezy/cmd_version_info.py 2020-02-07 02:14:30 +0000 | |||
1478 | +++ breezy/cmd_version_info.py 2020-02-18 05:49:35 +0000 | |||
1479 | @@ -16,8 +16,6 @@ | |||
1480 | 16 | 16 | ||
1481 | 17 | """Commands for generating snapshot information about a brz tree.""" | 17 | """Commands for generating snapshot information about a brz tree.""" |
1482 | 18 | 18 | ||
1483 | 19 | from __future__ import absolute_import | ||
1484 | 20 | |||
1485 | 21 | from .lazy_import import lazy_import | 19 | from .lazy_import import lazy_import |
1486 | 22 | 20 | ||
1487 | 23 | lazy_import(globals(), """ | 21 | lazy_import(globals(), """ |
1488 | 24 | 22 | ||
1489 | === modified file 'breezy/cmdline.py' | |||
1490 | --- breezy/cmdline.py 2018-11-12 01:41:38 +0000 | |||
1491 | +++ breezy/cmdline.py 2020-02-18 05:49:35 +0000 | |||
1492 | @@ -20,8 +20,6 @@ | |||
1493 | 20 | configuring_bazaar.txt. | 20 | configuring_bazaar.txt. |
1494 | 21 | """ | 21 | """ |
1495 | 22 | 22 | ||
1496 | 23 | from __future__ import absolute_import | ||
1497 | 24 | |||
1498 | 25 | import re | 23 | import re |
1499 | 26 | 24 | ||
1500 | 27 | 25 | ||
1501 | 28 | 26 | ||
1502 | === modified file 'breezy/colordiff.py' | |||
1503 | --- breezy/colordiff.py 2020-01-31 02:31:42 +0000 | |||
1504 | +++ breezy/colordiff.py 2020-02-18 05:49:35 +0000 | |||
1505 | @@ -15,8 +15,6 @@ | |||
1506 | 15 | # along with this program; if not, write to the Free Software | 15 | # along with this program; if not, write to the Free Software |
1507 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1508 | 17 | 17 | ||
1509 | 18 | from __future__ import absolute_import | ||
1510 | 19 | |||
1511 | 20 | import re | 18 | import re |
1512 | 21 | import sys | 19 | import sys |
1513 | 22 | from os.path import expanduser | 20 | from os.path import expanduser |
1514 | 23 | 21 | ||
1515 | === modified file 'breezy/commands.py' | |||
1516 | --- breezy/commands.py 2020-02-13 23:57:28 +0000 | |||
1517 | +++ breezy/commands.py 2020-02-18 05:49:35 +0000 | |||
1518 | @@ -14,8 +14,6 @@ | |||
1519 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1520 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1521 | 16 | 16 | ||
1522 | 17 | from __future__ import absolute_import | ||
1523 | 18 | |||
1524 | 19 | # TODO: Define arguments by objects, rather than just using names. | 17 | # TODO: Define arguments by objects, rather than just using names. |
1525 | 20 | # Those objects can specify the expected type of the argument, which | 18 | # Those objects can specify the expected type of the argument, which |
1526 | 21 | # would help with validation and shell completion. They could also provide | 19 | # would help with validation and shell completion. They could also provide |
1527 | 22 | 20 | ||
1528 | === modified file 'breezy/commit.py' | |||
1529 | --- breezy/commit.py 2020-02-07 02:14:30 +0000 | |||
1530 | +++ breezy/commit.py 2020-02-18 05:49:35 +0000 | |||
1531 | @@ -14,8 +14,6 @@ | |||
1532 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1533 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1534 | 16 | 16 | ||
1535 | 17 | from __future__ import absolute_import | ||
1536 | 18 | |||
1537 | 19 | # The newly committed revision is going to have a shape corresponding | 17 | # The newly committed revision is going to have a shape corresponding |
1538 | 20 | # to that of the working tree. Files that are not in the | 18 | # to that of the working tree. Files that are not in the |
1539 | 21 | # working tree and that were in the predecessor are reported as | 19 | # working tree and that were in the predecessor are reported as |
1540 | 22 | 20 | ||
1541 | === modified file 'breezy/commit_signature_commands.py' | |||
1542 | --- breezy/commit_signature_commands.py 2020-02-07 02:14:30 +0000 | |||
1543 | +++ breezy/commit_signature_commands.py 2020-02-18 05:49:35 +0000 | |||
1544 | @@ -16,8 +16,6 @@ | |||
1545 | 16 | 16 | ||
1546 | 17 | """Command that signs unsigned commits by the current user. """ | 17 | """Command that signs unsigned commits by the current user. """ |
1547 | 18 | 18 | ||
1548 | 19 | from __future__ import absolute_import | ||
1549 | 20 | |||
1550 | 21 | from . import ( | 19 | from . import ( |
1551 | 22 | controldir, | 20 | controldir, |
1552 | 23 | errors, | 21 | errors, |
1553 | 24 | 22 | ||
1554 | === modified file 'breezy/config.py' | |||
1555 | --- breezy/config.py 2020-02-07 02:14:30 +0000 | |||
1556 | +++ breezy/config.py 2020-02-18 05:49:35 +0000 | |||
1557 | @@ -74,7 +74,6 @@ | |||
1558 | 74 | up=pull | 74 | up=pull |
1559 | 75 | """ | 75 | """ |
1560 | 76 | 76 | ||
1561 | 77 | from __future__ import absolute_import | ||
1562 | 78 | import os | 77 | import os |
1563 | 79 | import sys | 78 | import sys |
1564 | 80 | 79 | ||
1565 | 81 | 80 | ||
1566 | === modified file 'breezy/conflicts.py' | |||
1567 | --- breezy/conflicts.py 2020-02-07 02:14:30 +0000 | |||
1568 | +++ breezy/conflicts.py 2020-02-18 05:49:35 +0000 | |||
1569 | @@ -17,8 +17,6 @@ | |||
1570 | 17 | # TODO: 'brz resolve' should accept a directory name and work from that | 17 | # TODO: 'brz resolve' should accept a directory name and work from that |
1571 | 18 | # point down | 18 | # point down |
1572 | 19 | 19 | ||
1573 | 20 | from __future__ import absolute_import | ||
1574 | 21 | |||
1575 | 22 | import os | 20 | import os |
1576 | 23 | import re | 21 | import re |
1577 | 24 | 22 | ||
1578 | 25 | 23 | ||
1579 | === modified file 'breezy/controldir.py' | |||
1580 | --- breezy/controldir.py 2019-11-06 01:31:41 +0000 | |||
1581 | +++ breezy/controldir.py 2020-02-18 05:49:35 +0000 | |||
1582 | @@ -22,8 +22,6 @@ | |||
1583 | 22 | 22 | ||
1584 | 23 | """ | 23 | """ |
1585 | 24 | 24 | ||
1586 | 25 | from __future__ import absolute_import | ||
1587 | 26 | |||
1588 | 27 | from .lazy_import import lazy_import | 25 | from .lazy_import import lazy_import |
1589 | 28 | lazy_import(globals(), """ | 26 | lazy_import(globals(), """ |
1590 | 29 | import textwrap | 27 | import textwrap |
1591 | 30 | 28 | ||
1592 | === modified file 'breezy/counted_lock.py' | |||
1593 | --- breezy/counted_lock.py 2018-11-18 19:48:57 +0000 | |||
1594 | +++ breezy/counted_lock.py 2020-02-18 05:49:35 +0000 | |||
1595 | @@ -16,8 +16,6 @@ | |||
1596 | 16 | 16 | ||
1597 | 17 | """Counted lock class""" | 17 | """Counted lock class""" |
1598 | 18 | 18 | ||
1599 | 19 | from __future__ import absolute_import | ||
1600 | 20 | |||
1601 | 21 | from . import ( | 19 | from . import ( |
1602 | 22 | errors, | 20 | errors, |
1603 | 23 | ) | 21 | ) |
1604 | 24 | 22 | ||
1605 | === modified file 'breezy/crash.py' | |||
1606 | --- breezy/crash.py 2020-02-07 02:14:30 +0000 | |||
1607 | +++ breezy/crash.py 2020-02-18 05:49:35 +0000 | |||
1608 | @@ -36,8 +36,6 @@ | |||
1609 | 36 | -Dno_apport. | 36 | -Dno_apport. |
1610 | 37 | """ | 37 | """ |
1611 | 38 | 38 | ||
1612 | 39 | from __future__ import absolute_import | ||
1613 | 40 | |||
1614 | 41 | # for interactive testing, try the 'brz assert-fail' command | 39 | # for interactive testing, try the 'brz assert-fail' command |
1615 | 42 | # or see http://code.launchpad.net/~mbp/bzr/bzr-fail | 40 | # or see http://code.launchpad.net/~mbp/bzr/bzr-fail |
1616 | 43 | # | 41 | # |
1617 | 44 | 42 | ||
1618 | === modified file 'breezy/debug.py' | |||
1619 | --- breezy/debug.py 2017-07-30 16:59:50 +0000 | |||
1620 | +++ breezy/debug.py 2020-02-18 05:49:35 +0000 | |||
1621 | @@ -23,8 +23,6 @@ | |||
1622 | 23 | for a list of the available options. | 23 | for a list of the available options. |
1623 | 24 | """ | 24 | """ |
1624 | 25 | 25 | ||
1625 | 26 | from __future__ import absolute_import | ||
1626 | 27 | |||
1627 | 28 | debug_flags = set() | 26 | debug_flags = set() |
1628 | 29 | 27 | ||
1629 | 30 | 28 | ||
1630 | 31 | 29 | ||
1631 | === modified file 'breezy/decorators.py' | |||
1632 | --- breezy/decorators.py 2018-07-24 21:11:49 +0000 | |||
1633 | +++ breezy/decorators.py 2020-02-18 05:49:35 +0000 | |||
1634 | @@ -14,8 +14,6 @@ | |||
1635 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1636 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1637 | 16 | 16 | ||
1638 | 17 | from __future__ import absolute_import | ||
1639 | 18 | |||
1640 | 19 | from . import trace | 17 | from . import trace |
1641 | 20 | 18 | ||
1642 | 21 | 19 | ||
1643 | 22 | 20 | ||
1644 | === modified file 'breezy/delta.py' | |||
1645 | --- breezy/delta.py 2020-02-07 02:14:30 +0000 | |||
1646 | +++ breezy/delta.py 2020-02-18 05:49:35 +0000 | |||
1647 | @@ -14,8 +14,6 @@ | |||
1648 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1649 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1650 | 16 | 16 | ||
1651 | 17 | from __future__ import absolute_import | ||
1652 | 18 | |||
1653 | 19 | from io import StringIO | 17 | from io import StringIO |
1654 | 20 | 18 | ||
1655 | 21 | from breezy import ( | 19 | from breezy import ( |
1656 | 22 | 20 | ||
1657 | === modified file 'breezy/diff.py' | |||
1658 | --- breezy/diff.py 2020-02-07 02:14:30 +0000 | |||
1659 | +++ breezy/diff.py 2020-02-18 05:49:35 +0000 | |||
1660 | @@ -14,8 +14,6 @@ | |||
1661 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1662 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1663 | 16 | 16 | ||
1664 | 17 | from __future__ import absolute_import | ||
1665 | 18 | |||
1666 | 19 | import contextlib | 17 | import contextlib |
1667 | 20 | import difflib | 18 | import difflib |
1668 | 21 | import os | 19 | import os |
1669 | 22 | 20 | ||
1670 | === modified file 'breezy/directory_service.py' | |||
1671 | --- breezy/directory_service.py 2019-03-02 22:31:28 +0000 | |||
1672 | +++ breezy/directory_service.py 2020-02-18 05:49:35 +0000 | |||
1673 | @@ -20,8 +20,6 @@ | |||
1674 | 20 | to true URLs. Examples include lp:urls and per-user location aliases. | 20 | to true URLs. Examples include lp:urls and per-user location aliases. |
1675 | 21 | """ | 21 | """ |
1676 | 22 | 22 | ||
1677 | 23 | from __future__ import absolute_import | ||
1678 | 24 | |||
1679 | 25 | from . import ( | 23 | from . import ( |
1680 | 26 | errors, | 24 | errors, |
1681 | 27 | registry, | 25 | registry, |
1682 | 28 | 26 | ||
1683 | === modified file 'breezy/doc/__init__.py' | |||
1684 | --- breezy/doc/__init__.py 2017-05-23 14:08:03 +0000 | |||
1685 | +++ breezy/doc/__init__.py 2020-02-18 05:49:35 +0000 | |||
1686 | @@ -20,8 +20,6 @@ | |||
1687 | 20 | for man page generation. | 20 | for man page generation. |
1688 | 21 | """ | 21 | """ |
1689 | 22 | 22 | ||
1690 | 23 | from __future__ import absolute_import | ||
1691 | 24 | |||
1692 | 25 | 23 | ||
1693 | 26 | def load_tests(loader, basic_tests, pattern): | 24 | def load_tests(loader, basic_tests, pattern): |
1694 | 27 | suite = loader.suiteClass() | 25 | suite = loader.suiteClass() |
1695 | 28 | 26 | ||
1696 | === modified file 'breezy/doc/api/__init__.py' | |||
1697 | --- breezy/doc/api/__init__.py 2017-05-23 14:08:03 +0000 | |||
1698 | +++ breezy/doc/api/__init__.py 2020-02-18 05:49:35 +0000 | |||
1699 | @@ -24,8 +24,6 @@ | |||
1700 | 24 | For details on specific apis, see pydoc on the api, or read the source. | 24 | For details on specific apis, see pydoc on the api, or read the source. |
1701 | 25 | """ | 25 | """ |
1702 | 26 | 26 | ||
1703 | 27 | from __future__ import absolute_import | ||
1704 | 28 | |||
1705 | 29 | import doctest | 27 | import doctest |
1706 | 30 | import os | 28 | import os |
1707 | 31 | 29 | ||
1708 | 32 | 30 | ||
1709 | === modified file 'breezy/doc_generate/__init__.py' | |||
1710 | --- breezy/doc_generate/__init__.py 2017-05-30 21:42:49 +0000 | |||
1711 | +++ breezy/doc_generate/__init__.py 2020-02-18 05:49:35 +0000 | |||
1712 | @@ -14,8 +14,6 @@ | |||
1713 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1714 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1715 | 16 | 16 | ||
1716 | 17 | from __future__ import absolute_import | ||
1717 | 18 | |||
1718 | 19 | import datetime | 17 | import datetime |
1719 | 20 | import os | 18 | import os |
1720 | 21 | 19 | ||
1721 | 22 | 20 | ||
1722 | === modified file 'breezy/doc_generate/autodoc_bash_completion.py' | |||
1723 | --- breezy/doc_generate/autodoc_bash_completion.py 2018-11-11 04:08:32 +0000 | |||
1724 | +++ breezy/doc_generate/autodoc_bash_completion.py 2020-02-18 05:49:35 +0000 | |||
1725 | @@ -16,8 +16,6 @@ | |||
1726 | 16 | 16 | ||
1727 | 17 | "bash_completion.py - create bash completion script from built-in brz help" | 17 | "bash_completion.py - create bash completion script from built-in brz help" |
1728 | 18 | 18 | ||
1729 | 19 | from __future__ import absolute_import | ||
1730 | 20 | |||
1731 | 21 | import breezy | 19 | import breezy |
1732 | 22 | import breezy.help | 20 | import breezy.help |
1733 | 23 | import breezy.commands | 21 | import breezy.commands |
1734 | 24 | 22 | ||
1735 | === modified file 'breezy/doc_generate/autodoc_man.py' | |||
1736 | --- breezy/doc_generate/autodoc_man.py 2018-11-11 04:08:32 +0000 | |||
1737 | +++ breezy/doc_generate/autodoc_man.py 2020-02-18 05:49:35 +0000 | |||
1738 | @@ -21,8 +21,6 @@ | |||
1739 | 21 | * add command aliases | 21 | * add command aliases |
1740 | 22 | """ | 22 | """ |
1741 | 23 | 23 | ||
1742 | 24 | from __future__ import absolute_import | ||
1743 | 25 | |||
1744 | 26 | PLUGINS_TO_DOCUMENT = ["launchpad"] | 24 | PLUGINS_TO_DOCUMENT = ["launchpad"] |
1745 | 27 | 25 | ||
1746 | 28 | import textwrap | 26 | import textwrap |
1747 | 29 | 27 | ||
1748 | === modified file 'breezy/doc_generate/autodoc_rstx.py' | |||
1749 | --- breezy/doc_generate/autodoc_rstx.py 2019-01-03 01:23:19 +0000 | |||
1750 | +++ breezy/doc_generate/autodoc_rstx.py 2020-02-18 05:49:35 +0000 | |||
1751 | @@ -20,8 +20,6 @@ | |||
1752 | 20 | Written by the Bazaar/Breezy community. | 20 | Written by the Bazaar/Breezy community. |
1753 | 21 | """ | 21 | """ |
1754 | 22 | 22 | ||
1755 | 23 | from __future__ import absolute_import | ||
1756 | 24 | |||
1757 | 25 | import time | 23 | import time |
1758 | 26 | 24 | ||
1759 | 27 | import breezy | 25 | import breezy |
1760 | 28 | 26 | ||
1761 | === modified file 'breezy/doc_generate/conf.py' | |||
1762 | --- breezy/doc_generate/conf.py 2018-11-18 21:24:22 +0000 | |||
1763 | +++ breezy/doc_generate/conf.py 2020-02-18 05:49:35 +0000 | |||
1764 | @@ -6,8 +6,6 @@ | |||
1765 | 6 | # All configuration values have a default; values that are commented out | 6 | # All configuration values have a default; values that are commented out |
1766 | 7 | # serve to show the default. | 7 | # serve to show the default. |
1767 | 8 | 8 | ||
1768 | 9 | from __future__ import absolute_import | ||
1769 | 10 | |||
1770 | 11 | # FIXME: better move the content of doc/en/conf.py here and cleanup the result | 9 | # FIXME: better move the content of doc/en/conf.py here and cleanup the result |
1771 | 12 | # -- vila 20100428 | 10 | # -- vila 20100428 |
1772 | 13 | 11 | ||
1773 | 14 | 12 | ||
1774 | === modified file 'breezy/email_message.py' | |||
1775 | --- breezy/email_message.py 2020-02-07 02:14:30 +0000 | |||
1776 | +++ breezy/email_message.py 2020-02-18 05:49:35 +0000 | |||
1777 | @@ -16,8 +16,6 @@ | |||
1778 | 16 | 16 | ||
1779 | 17 | """A convenience class around email.Message and email.MIMEMultipart.""" | 17 | """A convenience class around email.Message and email.MIMEMultipart.""" |
1780 | 18 | 18 | ||
1781 | 19 | from __future__ import absolute_import | ||
1782 | 20 | |||
1783 | 21 | from email.message import Message | 19 | from email.message import Message |
1784 | 22 | from email.header import Header | 20 | from email.header import Header |
1785 | 23 | from email.mime.multipart import MIMEMultipart | 21 | from email.mime.multipart import MIMEMultipart |
1786 | 24 | 22 | ||
1787 | === modified file 'breezy/errors.py' | |||
1788 | --- breezy/errors.py 2020-02-07 02:14:30 +0000 | |||
1789 | +++ breezy/errors.py 2020-02-18 05:49:35 +0000 | |||
1790 | @@ -17,8 +17,6 @@ | |||
1791 | 17 | """Exceptions for bzr, and reporting of them. | 17 | """Exceptions for bzr, and reporting of them. |
1792 | 18 | """ | 18 | """ |
1793 | 19 | 19 | ||
1794 | 20 | from __future__ import absolute_import | ||
1795 | 21 | |||
1796 | 22 | 20 | ||
1797 | 23 | # TODO: is there any value in providing the .args field used by standard | 21 | # TODO: is there any value in providing the .args field used by standard |
1798 | 24 | # python exceptions? A list of values with no names seems less useful | 22 | # python exceptions? A list of values with no names seems less useful |
1799 | 25 | 23 | ||
1800 | === modified file 'breezy/estimate_compressed_size.py' | |||
1801 | --- breezy/estimate_compressed_size.py 2018-11-11 04:08:32 +0000 | |||
1802 | +++ breezy/estimate_compressed_size.py 2020-02-18 05:49:35 +0000 | |||
1803 | @@ -16,8 +16,6 @@ | |||
1804 | 16 | 16 | ||
1805 | 17 | """Code to estimate the entropy of content""" | 17 | """Code to estimate the entropy of content""" |
1806 | 18 | 18 | ||
1807 | 19 | from __future__ import absolute_import | ||
1808 | 20 | |||
1809 | 21 | import zlib | 19 | import zlib |
1810 | 22 | 20 | ||
1811 | 23 | 21 | ||
1812 | 24 | 22 | ||
1813 | === modified file 'breezy/export.py' | |||
1814 | --- breezy/export.py 2019-01-13 18:33:39 +0000 | |||
1815 | +++ breezy/export.py 2020-02-18 05:49:35 +0000 | |||
1816 | @@ -17,8 +17,6 @@ | |||
1817 | 17 | """Export trees to tarballs, non-controlled directories, zipfiles, etc. | 17 | """Export trees to tarballs, non-controlled directories, zipfiles, etc. |
1818 | 18 | """ | 18 | """ |
1819 | 19 | 19 | ||
1820 | 20 | from __future__ import absolute_import | ||
1821 | 21 | |||
1822 | 22 | import errno | 20 | import errno |
1823 | 23 | import os | 21 | import os |
1824 | 24 | import sys | 22 | import sys |
1825 | 25 | 23 | ||
1826 | === modified file 'breezy/export_pot.py' | |||
1827 | --- breezy/export_pot.py 2020-02-13 23:57:28 +0000 | |||
1828 | +++ breezy/export_pot.py 2020-02-18 05:49:35 +0000 | |||
1829 | @@ -26,8 +26,6 @@ | |||
1830 | 26 | is also left to that stage of the process. | 26 | is also left to that stage of the process. |
1831 | 27 | """ | 27 | """ |
1832 | 28 | 28 | ||
1833 | 29 | from __future__ import absolute_import | ||
1834 | 30 | |||
1835 | 31 | import inspect | 29 | import inspect |
1836 | 32 | import os | 30 | import os |
1837 | 33 | import sys | 31 | import sys |
1838 | 34 | 32 | ||
1839 | === modified file 'breezy/externalcommand.py' | |||
1840 | --- breezy/externalcommand.py 2018-11-11 04:08:32 +0000 | |||
1841 | +++ breezy/externalcommand.py 2020-02-18 05:49:35 +0000 | |||
1842 | @@ -14,8 +14,6 @@ | |||
1843 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1844 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1845 | 16 | 16 | ||
1846 | 17 | from __future__ import absolute_import | ||
1847 | 18 | |||
1848 | 19 | # TODO: Perhaps rather than mapping options and arguments back and | 17 | # TODO: Perhaps rather than mapping options and arguments back and |
1849 | 20 | # forth, we should just pass in the whole argv, and allow | 18 | # forth, we should just pass in the whole argv, and allow |
1850 | 21 | # ExternalCommands to handle it differently to internal commands? | 19 | # ExternalCommands to handle it differently to internal commands? |
1851 | 22 | 20 | ||
1852 | === modified file 'breezy/fetch_ghosts.py' | |||
1853 | --- breezy/fetch_ghosts.py 2020-02-07 02:14:30 +0000 | |||
1854 | +++ breezy/fetch_ghosts.py 2020-02-18 05:49:35 +0000 | |||
1855 | @@ -14,8 +14,6 @@ | |||
1856 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
1857 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1858 | 16 | 16 | ||
1859 | 17 | from __future__ import absolute_import | ||
1860 | 18 | |||
1861 | 19 | import contextlib | 17 | import contextlib |
1862 | 20 | 18 | ||
1863 | 21 | from .branch import Branch | 19 | from .branch import Branch |
1864 | 22 | 20 | ||
1865 | === modified file 'breezy/fifo_cache.py' | |||
1866 | --- breezy/fifo_cache.py 2018-11-11 04:08:32 +0000 | |||
1867 | +++ breezy/fifo_cache.py 2020-02-18 05:49:35 +0000 | |||
1868 | @@ -16,8 +16,6 @@ | |||
1869 | 16 | 16 | ||
1870 | 17 | """A simple first-in-first-out (FIFO) cache.""" | 17 | """A simple first-in-first-out (FIFO) cache.""" |
1871 | 18 | 18 | ||
1872 | 19 | from __future__ import absolute_import, division | ||
1873 | 20 | |||
1874 | 21 | from collections import deque | 19 | from collections import deque |
1875 | 22 | 20 | ||
1876 | 23 | 21 | ||
1877 | 24 | 22 | ||
1878 | === modified file 'breezy/filter_tree.py' | |||
1879 | --- breezy/filter_tree.py 2020-01-10 01:40:18 +0000 | |||
1880 | +++ breezy/filter_tree.py 2020-02-18 05:49:35 +0000 | |||
1881 | @@ -17,8 +17,6 @@ | |||
1882 | 17 | """Content-filtered view of any tree. | 17 | """Content-filtered view of any tree. |
1883 | 18 | """ | 18 | """ |
1884 | 19 | 19 | ||
1885 | 20 | from __future__ import absolute_import | ||
1886 | 21 | |||
1887 | 22 | from io import BytesIO | 20 | from io import BytesIO |
1888 | 23 | 21 | ||
1889 | 24 | from . import ( | 22 | from . import ( |
1890 | 25 | 23 | ||
1891 | === modified file 'breezy/filters/__init__.py' | |||
1892 | --- breezy/filters/__init__.py 2020-01-30 17:54:42 +0000 | |||
1893 | +++ breezy/filters/__init__.py 2020-02-18 05:49:35 +0000 | |||
1894 | @@ -38,7 +38,6 @@ | |||
1895 | 38 | Note that context is currently only supported for write converters. | 38 | Note that context is currently only supported for write converters. |
1896 | 39 | """ | 39 | """ |
1897 | 40 | 40 | ||
1898 | 41 | from __future__ import absolute_import | ||
1899 | 42 | 41 | ||
1900 | 43 | from io import ( | 42 | from io import ( |
1901 | 44 | BytesIO, | 43 | BytesIO, |
1902 | 45 | 44 | ||
1903 | === modified file 'breezy/filters/eol.py' | |||
1904 | --- breezy/filters/eol.py 2018-11-11 04:08:32 +0000 | |||
1905 | +++ breezy/filters/eol.py 2020-02-18 05:49:35 +0000 | |||
1906 | @@ -19,9 +19,6 @@ | |||
1907 | 19 | See bzr help eol for details. | 19 | See bzr help eol for details. |
1908 | 20 | """ | 20 | """ |
1909 | 21 | 21 | ||
1910 | 22 | from __future__ import absolute_import | ||
1911 | 23 | |||
1912 | 24 | |||
1913 | 25 | import re | 22 | import re |
1914 | 26 | import sys | 23 | import sys |
1915 | 27 | 24 | ||
1916 | 28 | 25 | ||
1917 | === modified file 'breezy/foreign.py' | |||
1918 | --- breezy/foreign.py 2020-01-11 17:50:28 +0000 | |||
1919 | +++ breezy/foreign.py 2020-02-18 05:49:35 +0000 | |||
1920 | @@ -16,9 +16,6 @@ | |||
1921 | 16 | 16 | ||
1922 | 17 | """Foreign branch utilities.""" | 17 | """Foreign branch utilities.""" |
1923 | 18 | 18 | ||
1924 | 19 | from __future__ import absolute_import | ||
1925 | 20 | |||
1926 | 21 | |||
1927 | 22 | from .branch import ( | 19 | from .branch import ( |
1928 | 23 | Branch, | 20 | Branch, |
1929 | 24 | ) | 21 | ) |
1930 | 25 | 22 | ||
1931 | === modified file 'breezy/git/__init__.py' | |||
1932 | --- breezy/git/__init__.py 2020-01-12 13:56:10 +0000 | |||
1933 | +++ breezy/git/__init__.py 2020-02-18 05:49:35 +0000 | |||
1934 | @@ -22,8 +22,6 @@ | |||
1935 | 22 | 22 | ||
1936 | 23 | """A GIT branch and repository format implementation for bzr.""" | 23 | """A GIT branch and repository format implementation for bzr.""" |
1937 | 24 | 24 | ||
1938 | 25 | from __future__ import absolute_import | ||
1939 | 26 | |||
1940 | 27 | import os | 25 | import os |
1941 | 28 | import sys | 26 | import sys |
1942 | 29 | 27 | ||
1943 | 30 | 28 | ||
1944 | === modified file 'breezy/git/annotate.py' | |||
1945 | --- breezy/git/annotate.py 2020-02-09 01:27:02 +0000 | |||
1946 | +++ breezy/git/annotate.py 2020-02-18 05:49:35 +0000 | |||
1947 | @@ -16,8 +16,6 @@ | |||
1948 | 16 | 16 | ||
1949 | 17 | """Annotate.""" | 17 | """Annotate.""" |
1950 | 18 | 18 | ||
1951 | 19 | from __future__ import absolute_import | ||
1952 | 20 | |||
1953 | 21 | from dulwich.object_store import ( | 19 | from dulwich.object_store import ( |
1954 | 22 | tree_lookup_path, | 20 | tree_lookup_path, |
1955 | 23 | ) | 21 | ) |
1956 | 24 | 22 | ||
1957 | === modified file 'breezy/git/branch.py' | |||
1958 | --- breezy/git/branch.py 2020-02-07 02:14:30 +0000 | |||
1959 | +++ breezy/git/branch.py 2020-02-18 05:49:35 +0000 | |||
1960 | @@ -17,7 +17,6 @@ | |||
1961 | 17 | 17 | ||
1962 | 18 | """An adapter between a Git Branch and a Bazaar Branch""" | 18 | """An adapter between a Git Branch and a Bazaar Branch""" |
1963 | 19 | 19 | ||
1964 | 20 | from __future__ import absolute_import | ||
1965 | 21 | 20 | ||
1966 | 22 | import contextlib | 21 | import contextlib |
1967 | 23 | from io import BytesIO | 22 | from io import BytesIO |
1968 | 24 | 23 | ||
1969 | === modified file 'breezy/git/cache.py' | |||
1970 | --- breezy/git/cache.py 2020-02-07 02:14:30 +0000 | |||
1971 | +++ breezy/git/cache.py 2020-02-18 05:49:35 +0000 | |||
1972 | @@ -16,8 +16,6 @@ | |||
1973 | 16 | 16 | ||
1974 | 17 | """Map from Git sha's to Bazaar objects.""" | 17 | """Map from Git sha's to Bazaar objects.""" |
1975 | 18 | 18 | ||
1976 | 19 | from __future__ import absolute_import | ||
1977 | 20 | |||
1978 | 21 | from dulwich.objects import ( | 19 | from dulwich.objects import ( |
1979 | 22 | sha_to_hex, | 20 | sha_to_hex, |
1980 | 23 | hex_to_sha, | 21 | hex_to_sha, |
1981 | 24 | 22 | ||
1982 | === modified file 'breezy/git/commands.py' | |||
1983 | --- breezy/git/commands.py 2020-02-07 02:14:30 +0000 | |||
1984 | +++ breezy/git/commands.py 2020-02-18 05:49:35 +0000 | |||
1985 | @@ -21,8 +21,6 @@ | |||
1986 | 21 | 21 | ||
1987 | 22 | """Git-specific subcommands for Bazaar.""" | 22 | """Git-specific subcommands for Bazaar.""" |
1988 | 23 | 23 | ||
1989 | 24 | from __future__ import absolute_import | ||
1990 | 25 | |||
1991 | 26 | import breezy.bzr # noqa: F401 | 24 | import breezy.bzr # noqa: F401 |
1992 | 27 | from breezy import controldir | 25 | from breezy import controldir |
1993 | 28 | from ..commands import ( | 26 | from ..commands import ( |
1994 | 29 | 27 | ||
1995 | === modified file 'breezy/git/commit.py' | |||
1996 | --- breezy/git/commit.py 2020-02-07 02:14:30 +0000 | |||
1997 | +++ breezy/git/commit.py 2020-02-18 05:49:35 +0000 | |||
1998 | @@ -17,8 +17,6 @@ | |||
1999 | 17 | 17 | ||
2000 | 18 | """Support for committing in native Git working trees.""" | 18 | """Support for committing in native Git working trees.""" |
2001 | 19 | 19 | ||
2002 | 20 | from __future__ import absolute_import | ||
2003 | 21 | |||
2004 | 22 | from dulwich.index import ( | 20 | from dulwich.index import ( |
2005 | 23 | commit_tree, | 21 | commit_tree, |
2006 | 24 | ) | 22 | ) |
2007 | 25 | 23 | ||
2008 | === modified file 'breezy/git/config.py' | |||
2009 | --- breezy/git/config.py 2018-11-11 14:23:06 +0000 | |||
2010 | +++ breezy/git/config.py 2020-02-18 05:49:35 +0000 | |||
2011 | @@ -16,8 +16,6 @@ | |||
2012 | 16 | 16 | ||
2013 | 17 | """Config file handling for Git.""" | 17 | """Config file handling for Git.""" |
2014 | 18 | 18 | ||
2015 | 19 | from __future__ import absolute_import | ||
2016 | 20 | |||
2017 | 21 | from .. import ( | 19 | from .. import ( |
2018 | 22 | config, | 20 | config, |
2019 | 23 | ) | 21 | ) |
2020 | 24 | 22 | ||
2021 | === modified file 'breezy/git/dir.py' | |||
2022 | --- breezy/git/dir.py 2020-02-07 02:14:30 +0000 | |||
2023 | +++ breezy/git/dir.py 2020-02-18 05:49:35 +0000 | |||
2024 | @@ -17,8 +17,6 @@ | |||
2025 | 17 | 17 | ||
2026 | 18 | """An adapter between a Git control dir and a Bazaar ControlDir.""" | 18 | """An adapter between a Git control dir and a Bazaar ControlDir.""" |
2027 | 19 | 19 | ||
2028 | 20 | from __future__ import absolute_import | ||
2029 | 21 | |||
2030 | 22 | import contextlib | 20 | import contextlib |
2031 | 23 | 21 | ||
2032 | 24 | from .. import ( | 22 | from .. import ( |
2033 | 25 | 23 | ||
2034 | === modified file 'breezy/git/directory.py' | |||
2035 | --- breezy/git/directory.py 2019-02-09 02:59:15 +0000 | |||
2036 | +++ breezy/git/directory.py 2020-02-18 05:49:35 +0000 | |||
2037 | @@ -17,8 +17,6 @@ | |||
2038 | 17 | 17 | ||
2039 | 18 | """Directory service for gitorious.""" | 18 | """Directory service for gitorious.""" |
2040 | 19 | 19 | ||
2041 | 20 | from __future__ import absolute_import | ||
2042 | 21 | |||
2043 | 22 | from .. import transport | 20 | from .. import transport |
2044 | 23 | 21 | ||
2045 | 24 | transport.register_urlparse_netloc_protocol('github') | 22 | transport.register_urlparse_netloc_protocol('github') |
2046 | 25 | 23 | ||
2047 | === modified file 'breezy/git/errors.py' | |||
2048 | --- breezy/git/errors.py 2019-11-03 00:17:16 +0000 | |||
2049 | +++ breezy/git/errors.py 2020-02-18 05:49:35 +0000 | |||
2050 | @@ -15,11 +15,8 @@ | |||
2051 | 15 | # along with this program; if not, write to the Free Software | 15 | # along with this program; if not, write to the Free Software |
2052 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2053 | 17 | 17 | ||
2054 | 18 | |||
2055 | 19 | """A grouping of Exceptions for bzr-git""" | 18 | """A grouping of Exceptions for bzr-git""" |
2056 | 20 | 19 | ||
2057 | 21 | from __future__ import absolute_import | ||
2058 | 22 | |||
2059 | 23 | from dulwich import errors as git_errors | 20 | from dulwich import errors as git_errors |
2060 | 24 | 21 | ||
2061 | 25 | from .. import errors as brz_errors | 22 | from .. import errors as brz_errors |
2062 | 26 | 23 | ||
2063 | === modified file 'breezy/git/fetch.py' | |||
2064 | --- breezy/git/fetch.py 2020-02-13 23:57:28 +0000 | |||
2065 | +++ breezy/git/fetch.py 2020-02-18 05:49:35 +0000 | |||
2066 | @@ -16,8 +16,6 @@ | |||
2067 | 16 | 16 | ||
2068 | 17 | """Fetching from git into bzr.""" | 17 | """Fetching from git into bzr.""" |
2069 | 18 | 18 | ||
2070 | 19 | from __future__ import absolute_import | ||
2071 | 20 | |||
2072 | 21 | from dulwich.objects import ( | 19 | from dulwich.objects import ( |
2073 | 22 | Commit, | 20 | Commit, |
2074 | 23 | Tag, | 21 | Tag, |
2075 | 24 | 22 | ||
2076 | === modified file 'breezy/git/filegraph.py' | |||
2077 | --- breezy/git/filegraph.py 2019-10-20 23:33:25 +0000 | |||
2078 | +++ breezy/git/filegraph.py 2020-02-18 05:49:35 +0000 | |||
2079 | @@ -17,8 +17,6 @@ | |||
2080 | 17 | 17 | ||
2081 | 18 | """File graph access.""" | 18 | """File graph access.""" |
2082 | 19 | 19 | ||
2083 | 20 | from __future__ import absolute_import | ||
2084 | 21 | |||
2085 | 22 | import stat | 20 | import stat |
2086 | 23 | 21 | ||
2087 | 24 | from dulwich.errors import ( | 22 | from dulwich.errors import ( |
2088 | 25 | 23 | ||
2089 | === modified file 'breezy/git/git_remote_helper.py' | |||
2090 | --- breezy/git/git_remote_helper.py 2020-02-07 02:14:30 +0000 | |||
2091 | +++ breezy/git/git_remote_helper.py 2020-02-18 05:49:35 +0000 | |||
2092 | @@ -20,8 +20,6 @@ | |||
2093 | 20 | 20 | ||
2094 | 21 | """Remote helper for git for accessing bzr repositories.""" | 21 | """Remote helper for git for accessing bzr repositories.""" |
2095 | 22 | 22 | ||
2096 | 23 | from __future__ import absolute_import | ||
2097 | 24 | |||
2098 | 25 | CAPABILITIES = ["fetch", "option", "push"] | 23 | CAPABILITIES = ["fetch", "option", "push"] |
2099 | 26 | 24 | ||
2100 | 27 | import os | 25 | import os |
2101 | 28 | 26 | ||
2102 | === modified file 'breezy/git/help.py' | |||
2103 | --- breezy/git/help.py 2018-03-26 22:28:24 +0000 | |||
2104 | +++ breezy/git/help.py 2020-02-18 05:49:35 +0000 | |||
2105 | @@ -16,8 +16,6 @@ | |||
2106 | 16 | 16 | ||
2107 | 17 | """Help information.""" | 17 | """Help information.""" |
2108 | 18 | 18 | ||
2109 | 19 | from __future__ import absolute_import | ||
2110 | 20 | |||
2111 | 21 | help_git = """Using Bazaar with Git. | 19 | help_git = """Using Bazaar with Git. |
2112 | 22 | 20 | ||
2113 | 23 | The bzr-git plugin provides support for using Bazaar with local and remote | 21 | The bzr-git plugin provides support for using Bazaar with local and remote |
2114 | 24 | 22 | ||
2115 | === modified file 'breezy/git/hg.py' | |||
2116 | --- breezy/git/hg.py 2018-11-11 04:08:32 +0000 | |||
2117 | +++ breezy/git/hg.py 2020-02-18 05:49:35 +0000 | |||
2118 | @@ -17,8 +17,6 @@ | |||
2119 | 17 | 17 | ||
2120 | 18 | """Compatibility for hg-git.""" | 18 | """Compatibility for hg-git.""" |
2121 | 19 | 19 | ||
2122 | 20 | from __future__ import absolute_import | ||
2123 | 21 | |||
2124 | 22 | import urllib | 20 | import urllib |
2125 | 23 | 21 | ||
2126 | 24 | 22 | ||
2127 | 25 | 23 | ||
2128 | === modified file 'breezy/git/interrepo.py' | |||
2129 | --- breezy/git/interrepo.py 2020-02-07 02:14:30 +0000 | |||
2130 | +++ breezy/git/interrepo.py 2020-02-18 05:49:35 +0000 | |||
2131 | @@ -16,8 +16,6 @@ | |||
2132 | 16 | 16 | ||
2133 | 17 | """InterRepository operations.""" | 17 | """InterRepository operations.""" |
2134 | 18 | 18 | ||
2135 | 19 | from __future__ import absolute_import | ||
2136 | 20 | |||
2137 | 21 | from io import BytesIO | 19 | from io import BytesIO |
2138 | 22 | import itertools | 20 | import itertools |
2139 | 23 | 21 | ||
2140 | 24 | 22 | ||
2141 | === modified file 'breezy/git/mapping.py' | |||
2142 | --- breezy/git/mapping.py 2020-02-07 02:14:30 +0000 | |||
2143 | +++ breezy/git/mapping.py 2020-02-18 05:49:35 +0000 | |||
2144 | @@ -18,8 +18,6 @@ | |||
2145 | 18 | 18 | ||
2146 | 19 | """Converters, etc for going between Bazaar and Git ids.""" | 19 | """Converters, etc for going between Bazaar and Git ids.""" |
2147 | 20 | 20 | ||
2148 | 21 | from __future__ import absolute_import | ||
2149 | 22 | |||
2150 | 23 | import base64 | 21 | import base64 |
2151 | 24 | import stat | 22 | import stat |
2152 | 25 | 23 | ||
2153 | 26 | 24 | ||
2154 | === modified file 'breezy/git/memorytree.py' | |||
2155 | --- breezy/git/memorytree.py 2019-06-29 15:50:22 +0000 | |||
2156 | +++ breezy/git/memorytree.py 2020-02-18 05:49:35 +0000 | |||
2157 | @@ -17,8 +17,6 @@ | |||
2158 | 17 | 17 | ||
2159 | 18 | """Git Memory Trees.""" | 18 | """Git Memory Trees.""" |
2160 | 19 | 19 | ||
2161 | 20 | from __future__ import absolute_import | ||
2162 | 21 | |||
2163 | 22 | import os | 20 | import os |
2164 | 23 | import posixpath | 21 | import posixpath |
2165 | 24 | import stat | 22 | import stat |
2166 | 25 | 23 | ||
2167 | === modified file 'breezy/git/object_store.py' | |||
2168 | --- breezy/git/object_store.py 2020-02-13 23:57:28 +0000 | |||
2169 | +++ breezy/git/object_store.py 2020-02-18 05:49:35 +0000 | |||
2170 | @@ -17,8 +17,6 @@ | |||
2171 | 17 | 17 | ||
2172 | 18 | """Map from Git sha's to Bazaar objects.""" | 18 | """Map from Git sha's to Bazaar objects.""" |
2173 | 19 | 19 | ||
2174 | 20 | from __future__ import absolute_import | ||
2175 | 21 | |||
2176 | 22 | from dulwich.objects import ( | 20 | from dulwich.objects import ( |
2177 | 23 | Blob, | 21 | Blob, |
2178 | 24 | Commit, | 22 | Commit, |
2179 | 25 | 23 | ||
2180 | === modified file 'breezy/git/pristine_tar.py' | |||
2181 | --- breezy/git/pristine_tar.py 2018-11-11 14:23:06 +0000 | |||
2182 | +++ breezy/git/pristine_tar.py 2020-02-18 05:49:35 +0000 | |||
2183 | @@ -17,8 +17,6 @@ | |||
2184 | 17 | 17 | ||
2185 | 18 | """Support for pristine tar deltas.""" | 18 | """Support for pristine tar deltas.""" |
2186 | 19 | 19 | ||
2187 | 20 | from __future__ import absolute_import | ||
2188 | 21 | |||
2189 | 22 | from base64 import ( | 20 | from base64 import ( |
2190 | 23 | standard_b64decode, | 21 | standard_b64decode, |
2191 | 24 | ) | 22 | ) |
2192 | 25 | 23 | ||
2193 | === modified file 'breezy/git/push.py' | |||
2194 | --- breezy/git/push.py 2018-11-11 14:23:06 +0000 | |||
2195 | +++ breezy/git/push.py 2020-02-18 05:49:35 +0000 | |||
2196 | @@ -16,8 +16,6 @@ | |||
2197 | 16 | 16 | ||
2198 | 17 | """Basic push implementation.""" | 17 | """Basic push implementation.""" |
2199 | 18 | 18 | ||
2200 | 19 | from __future__ import absolute_import | ||
2201 | 20 | |||
2202 | 21 | from ..push import ( | 19 | from ..push import ( |
2203 | 22 | PushResult, | 20 | PushResult, |
2204 | 23 | ) | 21 | ) |
2205 | 24 | 22 | ||
2206 | === modified file 'breezy/git/refs.py' | |||
2207 | --- breezy/git/refs.py 2018-11-11 14:23:06 +0000 | |||
2208 | +++ breezy/git/refs.py 2020-02-18 05:49:35 +0000 | |||
2209 | @@ -16,8 +16,6 @@ | |||
2210 | 16 | 16 | ||
2211 | 17 | """Conversion between refs and Bazaar revision pointers.""" | 17 | """Conversion between refs and Bazaar revision pointers.""" |
2212 | 18 | 18 | ||
2213 | 19 | from __future__ import absolute_import | ||
2214 | 20 | |||
2215 | 21 | from dulwich.refs import ( | 19 | from dulwich.refs import ( |
2216 | 22 | ANNOTATED_TAG_SUFFIX, | 20 | ANNOTATED_TAG_SUFFIX, |
2217 | 23 | LOCAL_BRANCH_PREFIX, | 21 | LOCAL_BRANCH_PREFIX, |
2218 | 24 | 22 | ||
2219 | === modified file 'breezy/git/remote.py' | |||
2220 | --- breezy/git/remote.py 2020-02-13 23:57:28 +0000 | |||
2221 | +++ breezy/git/remote.py 2020-02-18 05:49:35 +0000 | |||
2222 | @@ -16,8 +16,6 @@ | |||
2223 | 16 | 16 | ||
2224 | 17 | """Remote dirs, repositories and branches.""" | 17 | """Remote dirs, repositories and branches.""" |
2225 | 18 | 18 | ||
2226 | 19 | from __future__ import absolute_import | ||
2227 | 20 | |||
2228 | 21 | import gzip | 19 | import gzip |
2229 | 22 | from io import BytesIO | 20 | from io import BytesIO |
2230 | 23 | import re | 21 | import re |
2231 | 24 | 22 | ||
2232 | === modified file 'breezy/git/repository.py' | |||
2233 | --- breezy/git/repository.py 2020-02-07 02:14:30 +0000 | |||
2234 | +++ breezy/git/repository.py 2020-02-18 05:49:35 +0000 | |||
2235 | @@ -17,8 +17,6 @@ | |||
2236 | 17 | 17 | ||
2237 | 18 | """An adapter between a Git Repository and a Bazaar Branch""" | 18 | """An adapter between a Git Repository and a Bazaar Branch""" |
2238 | 19 | 19 | ||
2239 | 20 | from __future__ import absolute_import | ||
2240 | 21 | |||
2241 | 22 | from .. import ( | 20 | from .. import ( |
2242 | 23 | check, | 21 | check, |
2243 | 24 | errors, | 22 | errors, |
2244 | 25 | 23 | ||
2245 | === modified file 'breezy/git/revspec.py' | |||
2246 | --- breezy/git/revspec.py 2019-06-02 05:13:10 +0000 | |||
2247 | +++ breezy/git/revspec.py 2020-02-18 05:49:35 +0000 | |||
2248 | @@ -16,8 +16,6 @@ | |||
2249 | 16 | 16 | ||
2250 | 17 | """Custom revision specifier for Subversion.""" | 17 | """Custom revision specifier for Subversion.""" |
2251 | 18 | 18 | ||
2252 | 19 | from __future__ import absolute_import | ||
2253 | 20 | |||
2254 | 21 | # Please note that imports are delayed as much as possible here since | 19 | # Please note that imports are delayed as much as possible here since |
2255 | 22 | # if DWIM revspecs are supported this module is imported by __init__.py. | 20 | # if DWIM revspecs are supported this module is imported by __init__.py. |
2256 | 23 | 21 | ||
2257 | 24 | 22 | ||
2258 | === modified file 'breezy/git/roundtrip.py' | |||
2259 | --- breezy/git/roundtrip.py 2019-06-29 15:50:22 +0000 | |||
2260 | +++ breezy/git/roundtrip.py 2020-02-18 05:49:35 +0000 | |||
2261 | @@ -45,8 +45,6 @@ | |||
2262 | 45 | * TreeSupplement | 45 | * TreeSupplement |
2263 | 46 | """ | 46 | """ |
2264 | 47 | 47 | ||
2265 | 48 | from __future__ import absolute_import | ||
2266 | 49 | |||
2267 | 50 | from .. import osutils | 48 | from .. import osutils |
2268 | 51 | 49 | ||
2269 | 52 | from io import BytesIO | 50 | from io import BytesIO |
2270 | 53 | 51 | ||
2271 | === modified file 'breezy/git/send.py' | |||
2272 | --- breezy/git/send.py 2019-10-20 15:03:13 +0000 | |||
2273 | +++ breezy/git/send.py 2020-02-18 05:49:35 +0000 | |||
2274 | @@ -20,8 +20,6 @@ | |||
2275 | 20 | 20 | ||
2276 | 21 | """Support in "brz send" for git-am style patches.""" | 21 | """Support in "brz send" for git-am style patches.""" |
2277 | 22 | 22 | ||
2278 | 23 | from __future__ import absolute_import | ||
2279 | 24 | |||
2280 | 25 | import time | 23 | import time |
2281 | 26 | from .. import __version__ as brz_version | 24 | from .. import __version__ as brz_version |
2282 | 27 | from .. import ( | 25 | from .. import ( |
2283 | 28 | 26 | ||
2284 | === modified file 'breezy/git/server.py' | |||
2285 | --- breezy/git/server.py 2018-11-11 14:23:06 +0000 | |||
2286 | +++ breezy/git/server.py 2020-02-18 05:49:35 +0000 | |||
2287 | @@ -16,8 +16,6 @@ | |||
2288 | 16 | # along with this program; if not, write to the Free Software | 16 | # along with this program; if not, write to the Free Software |
2289 | 17 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 17 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2290 | 18 | 18 | ||
2291 | 19 | from __future__ import absolute_import | ||
2292 | 20 | |||
2293 | 21 | from dulwich.server import TCPGitServer | 19 | from dulwich.server import TCPGitServer |
2294 | 22 | 20 | ||
2295 | 23 | import sys | 21 | import sys |
2296 | 24 | 22 | ||
2297 | === modified file 'breezy/git/tests/__init__.py' | |||
2298 | --- breezy/git/tests/__init__.py 2020-01-24 00:06:05 +0000 | |||
2299 | +++ breezy/git/tests/__init__.py 2020-02-18 05:49:35 +0000 | |||
2300 | @@ -17,8 +17,6 @@ | |||
2301 | 17 | 17 | ||
2302 | 18 | """The basic test suite for bzr-git.""" | 18 | """The basic test suite for bzr-git.""" |
2303 | 19 | 19 | ||
2304 | 20 | from __future__ import absolute_import | ||
2305 | 21 | |||
2306 | 22 | from io import BytesIO | 20 | from io import BytesIO |
2307 | 23 | 21 | ||
2308 | 24 | import time | 22 | import time |
2309 | 25 | 23 | ||
2310 | === modified file 'breezy/git/tests/test_blackbox.py' | |||
2311 | --- breezy/git/tests/test_blackbox.py 2020-01-30 19:30:52 +0000 | |||
2312 | +++ breezy/git/tests/test_blackbox.py 2020-02-18 05:49:35 +0000 | |||
2313 | @@ -17,8 +17,6 @@ | |||
2314 | 17 | 17 | ||
2315 | 18 | """Black-box tests for bzr-git.""" | 18 | """Black-box tests for bzr-git.""" |
2316 | 19 | 19 | ||
2317 | 20 | from __future__ import absolute_import | ||
2318 | 21 | |||
2319 | 22 | from dulwich.repo import ( | 20 | from dulwich.repo import ( |
2320 | 23 | Repo as GitRepo, | 21 | Repo as GitRepo, |
2321 | 24 | ) | 22 | ) |
2322 | 25 | 23 | ||
2323 | === modified file 'breezy/git/tests/test_branch.py' | |||
2324 | --- breezy/git/tests/test_branch.py 2020-01-24 00:06:05 +0000 | |||
2325 | +++ breezy/git/tests/test_branch.py 2020-02-18 05:49:35 +0000 | |||
2326 | @@ -18,8 +18,6 @@ | |||
2327 | 18 | 18 | ||
2328 | 19 | """Tests for interfacing with a Git Branch""" | 19 | """Tests for interfacing with a Git Branch""" |
2329 | 20 | 20 | ||
2330 | 21 | from __future__ import absolute_import | ||
2331 | 22 | |||
2332 | 23 | import dulwich | 21 | import dulwich |
2333 | 24 | from dulwich.objects import ( | 22 | from dulwich.objects import ( |
2334 | 25 | Commit, | 23 | Commit, |
2335 | 26 | 24 | ||
2336 | === modified file 'breezy/git/tests/test_builder.py' | |||
2337 | --- breezy/git/tests/test_builder.py 2018-11-11 04:08:32 +0000 | |||
2338 | +++ breezy/git/tests/test_builder.py 2020-02-18 05:49:35 +0000 | |||
2339 | @@ -16,8 +16,6 @@ | |||
2340 | 16 | 16 | ||
2341 | 17 | """Test our ability to build up test repositories""" | 17 | """Test our ability to build up test repositories""" |
2342 | 18 | 18 | ||
2343 | 19 | from __future__ import absolute_import | ||
2344 | 20 | |||
2345 | 21 | from io import BytesIO | 19 | from io import BytesIO |
2346 | 22 | 20 | ||
2347 | 23 | from dulwich.repo import Repo as GitRepo | 21 | from dulwich.repo import Repo as GitRepo |
2348 | 24 | 22 | ||
2349 | === modified file 'breezy/git/tests/test_cache.py' | |||
2350 | --- breezy/git/tests/test_cache.py 2018-11-11 04:08:32 +0000 | |||
2351 | +++ breezy/git/tests/test_cache.py 2020-02-18 05:49:35 +0000 | |||
2352 | @@ -16,8 +16,6 @@ | |||
2353 | 16 | 16 | ||
2354 | 17 | """Tests for GitShaMap.""" | 17 | """Tests for GitShaMap.""" |
2355 | 18 | 18 | ||
2356 | 19 | from __future__ import absolute_import | ||
2357 | 20 | |||
2358 | 21 | from dulwich.objects import ( | 19 | from dulwich.objects import ( |
2359 | 22 | Blob, | 20 | Blob, |
2360 | 23 | Commit, | 21 | Commit, |
2361 | 24 | 22 | ||
2362 | === modified file 'breezy/git/tests/test_dir.py' | |||
2363 | --- breezy/git/tests/test_dir.py 2019-12-26 13:20:45 +0000 | |||
2364 | +++ breezy/git/tests/test_dir.py 2020-02-18 05:49:35 +0000 | |||
2365 | @@ -17,8 +17,6 @@ | |||
2366 | 17 | 17 | ||
2367 | 18 | """Test the GitDir class""" | 18 | """Test the GitDir class""" |
2368 | 19 | 19 | ||
2369 | 20 | from __future__ import absolute_import | ||
2370 | 21 | |||
2371 | 22 | from dulwich.repo import Repo as GitRepo | 20 | from dulwich.repo import Repo as GitRepo |
2372 | 23 | import os | 21 | import os |
2373 | 24 | 22 | ||
2374 | 25 | 23 | ||
2375 | === modified file 'breezy/git/tests/test_fetch.py' | |||
2376 | --- breezy/git/tests/test_fetch.py 2020-01-24 02:05:10 +0000 | |||
2377 | +++ breezy/git/tests/test_fetch.py 2020-02-18 05:49:35 +0000 | |||
2378 | @@ -17,8 +17,6 @@ | |||
2379 | 17 | 17 | ||
2380 | 18 | """Tests from fetching from git into bzr.""" | 18 | """Tests from fetching from git into bzr.""" |
2381 | 19 | 19 | ||
2382 | 20 | from __future__ import absolute_import | ||
2383 | 21 | |||
2384 | 22 | from dulwich.objects import ( | 20 | from dulwich.objects import ( |
2385 | 23 | Blob, | 21 | Blob, |
2386 | 24 | Tag, | 22 | Tag, |
2387 | 25 | 23 | ||
2388 | === modified file 'breezy/git/tests/test_git_remote_helper.py' | |||
2389 | --- breezy/git/tests/test_git_remote_helper.py 2020-01-31 17:43:44 +0000 | |||
2390 | +++ breezy/git/tests/test_git_remote_helper.py 2020-02-18 05:49:35 +0000 | |||
2391 | @@ -19,8 +19,6 @@ | |||
2392 | 19 | 19 | ||
2393 | 20 | """Tests for the git remote helper.""" | 20 | """Tests for the git remote helper.""" |
2394 | 21 | 21 | ||
2395 | 22 | from __future__ import absolute_import | ||
2396 | 23 | |||
2397 | 24 | from io import BytesIO | 22 | from io import BytesIO |
2398 | 25 | import os | 23 | import os |
2399 | 26 | import subprocess | 24 | import subprocess |
2400 | 27 | 25 | ||
2401 | === modified file 'breezy/git/tests/test_mapping.py' | |||
2402 | --- breezy/git/tests/test_mapping.py 2019-10-28 01:38:39 +0000 | |||
2403 | +++ breezy/git/tests/test_mapping.py 2020-02-18 05:49:35 +0000 | |||
2404 | @@ -17,8 +17,6 @@ | |||
2405 | 17 | 17 | ||
2406 | 18 | """Tests for mapping.""" | 18 | """Tests for mapping.""" |
2407 | 19 | 19 | ||
2408 | 20 | from __future__ import absolute_import | ||
2409 | 21 | |||
2410 | 22 | from ...revision import ( | 20 | from ...revision import ( |
2411 | 23 | Revision, | 21 | Revision, |
2412 | 24 | ) | 22 | ) |
2413 | 25 | 23 | ||
2414 | === modified file 'breezy/git/tests/test_object_store.py' | |||
2415 | --- breezy/git/tests/test_object_store.py 2019-05-28 23:34:07 +0000 | |||
2416 | +++ breezy/git/tests/test_object_store.py 2020-02-18 05:49:35 +0000 | |||
2417 | @@ -16,8 +16,6 @@ | |||
2418 | 16 | 16 | ||
2419 | 17 | """Tests for bzr-git's object store.""" | 17 | """Tests for bzr-git's object store.""" |
2420 | 18 | 18 | ||
2421 | 19 | from __future__ import absolute_import | ||
2422 | 20 | |||
2423 | 21 | import os | 19 | import os |
2424 | 22 | import shutil | 20 | import shutil |
2425 | 23 | import stat | 21 | import stat |
2426 | 24 | 22 | ||
2427 | === modified file 'breezy/git/tests/test_pristine_tar.py' | |||
2428 | --- breezy/git/tests/test_pristine_tar.py 2018-11-11 04:08:32 +0000 | |||
2429 | +++ breezy/git/tests/test_pristine_tar.py 2020-02-18 05:49:35 +0000 | |||
2430 | @@ -16,8 +16,6 @@ | |||
2431 | 16 | 16 | ||
2432 | 17 | """Tests for pristine tar extraction code.""" | 17 | """Tests for pristine tar extraction code.""" |
2433 | 18 | 18 | ||
2434 | 19 | from __future__ import absolute_import | ||
2435 | 20 | |||
2436 | 21 | from base64 import standard_b64encode | 19 | from base64 import standard_b64encode |
2437 | 22 | 20 | ||
2438 | 23 | from ..pristine_tar import ( | 21 | from ..pristine_tar import ( |
2439 | 24 | 22 | ||
2440 | === modified file 'breezy/git/tests/test_push.py' | |||
2441 | --- breezy/git/tests/test_push.py 2018-11-11 04:08:32 +0000 | |||
2442 | +++ breezy/git/tests/test_push.py 2020-02-18 05:49:35 +0000 | |||
2443 | @@ -17,8 +17,6 @@ | |||
2444 | 17 | 17 | ||
2445 | 18 | """Tests for pushing revisions from Bazaar into Git.""" | 18 | """Tests for pushing revisions from Bazaar into Git.""" |
2446 | 19 | 19 | ||
2447 | 20 | from __future__ import absolute_import | ||
2448 | 21 | |||
2449 | 22 | from ...controldir import ( | 20 | from ...controldir import ( |
2450 | 23 | format_registry, | 21 | format_registry, |
2451 | 24 | ) | 22 | ) |
2452 | 25 | 23 | ||
2453 | === modified file 'breezy/git/tests/test_refs.py' | |||
2454 | --- breezy/git/tests/test_refs.py 2018-11-11 04:08:32 +0000 | |||
2455 | +++ breezy/git/tests/test_refs.py 2020-02-18 05:49:35 +0000 | |||
2456 | @@ -18,8 +18,6 @@ | |||
2457 | 18 | 18 | ||
2458 | 19 | """Tests for ref handling.""" | 19 | """Tests for ref handling.""" |
2459 | 20 | 20 | ||
2460 | 21 | from __future__ import absolute_import | ||
2461 | 22 | |||
2462 | 23 | from ... import tests | 21 | from ... import tests |
2463 | 24 | 22 | ||
2464 | 25 | from ..object_store import BazaarObjectStore | 23 | from ..object_store import BazaarObjectStore |
2465 | 26 | 24 | ||
2466 | === modified file 'breezy/git/tests/test_remote.py' | |||
2467 | --- breezy/git/tests/test_remote.py 2020-02-08 18:51:59 +0000 | |||
2468 | +++ breezy/git/tests/test_remote.py 2020-02-18 05:49:35 +0000 | |||
2469 | @@ -16,8 +16,6 @@ | |||
2470 | 16 | 16 | ||
2471 | 17 | """Test the smart client.""" | 17 | """Test the smart client.""" |
2472 | 18 | 18 | ||
2473 | 19 | from __future__ import absolute_import | ||
2474 | 20 | |||
2475 | 21 | from io import BytesIO | 19 | from io import BytesIO |
2476 | 22 | 20 | ||
2477 | 23 | import os | 21 | import os |
2478 | 24 | 22 | ||
2479 | === modified file 'breezy/git/tests/test_repository.py' | |||
2480 | --- breezy/git/tests/test_repository.py 2019-06-29 13:16:26 +0000 | |||
2481 | +++ breezy/git/tests/test_repository.py 2020-02-18 05:49:35 +0000 | |||
2482 | @@ -17,8 +17,6 @@ | |||
2483 | 17 | 17 | ||
2484 | 18 | """Tests for interfacing with a Git Repository""" | 18 | """Tests for interfacing with a Git Repository""" |
2485 | 19 | 19 | ||
2486 | 20 | from __future__ import absolute_import | ||
2487 | 21 | |||
2488 | 22 | import dulwich | 20 | import dulwich |
2489 | 23 | from dulwich.repo import ( | 21 | from dulwich.repo import ( |
2490 | 24 | Repo as GitRepo, | 22 | Repo as GitRepo, |
2491 | 25 | 23 | ||
2492 | === modified file 'breezy/git/tests/test_revspec.py' | |||
2493 | --- breezy/git/tests/test_revspec.py 2019-02-03 01:42:11 +0000 | |||
2494 | +++ breezy/git/tests/test_revspec.py 2020-02-18 05:49:35 +0000 | |||
2495 | @@ -16,8 +16,6 @@ | |||
2496 | 16 | 16 | ||
2497 | 17 | """Test the git revision specifiers.""" | 17 | """Test the git revision specifiers.""" |
2498 | 18 | 18 | ||
2499 | 19 | from __future__ import absolute_import | ||
2500 | 20 | |||
2501 | 21 | from ...tests import TestCase | 19 | from ...tests import TestCase |
2502 | 22 | 20 | ||
2503 | 23 | from ..revspec import ( | 21 | from ..revspec import ( |
2504 | 24 | 22 | ||
2505 | === modified file 'breezy/git/tests/test_roundtrip.py' | |||
2506 | --- breezy/git/tests/test_roundtrip.py 2019-06-29 15:50:22 +0000 | |||
2507 | +++ breezy/git/tests/test_roundtrip.py 2020-02-18 05:49:35 +0000 | |||
2508 | @@ -18,8 +18,6 @@ | |||
2509 | 18 | 18 | ||
2510 | 19 | """Tests for roundtripping text parsing.""" | 19 | """Tests for roundtripping text parsing.""" |
2511 | 20 | 20 | ||
2512 | 21 | from __future__ import absolute_import | ||
2513 | 22 | |||
2514 | 23 | from ...tests import TestCase | 21 | from ...tests import TestCase |
2515 | 24 | 22 | ||
2516 | 25 | from ..roundtrip import ( | 23 | from ..roundtrip import ( |
2517 | 26 | 24 | ||
2518 | === modified file 'breezy/git/tests/test_server.py' | |||
2519 | --- breezy/git/tests/test_server.py 2018-11-11 04:08:32 +0000 | |||
2520 | +++ breezy/git/tests/test_server.py 2020-02-18 05:49:35 +0000 | |||
2521 | @@ -16,8 +16,6 @@ | |||
2522 | 16 | 16 | ||
2523 | 17 | """Test for git server.""" | 17 | """Test for git server.""" |
2524 | 18 | 18 | ||
2525 | 19 | from __future__ import absolute_import | ||
2526 | 20 | |||
2527 | 21 | from dulwich.client import TCPGitClient | 19 | from dulwich.client import TCPGitClient |
2528 | 22 | from dulwich.repo import Repo | 20 | from dulwich.repo import Repo |
2529 | 23 | import threading | 21 | import threading |
2530 | 24 | 22 | ||
2531 | === modified file 'breezy/git/tests/test_transportgit.py' | |||
2532 | --- breezy/git/tests/test_transportgit.py 2019-11-03 12:38:45 +0000 | |||
2533 | +++ breezy/git/tests/test_transportgit.py 2020-02-18 05:49:35 +0000 | |||
2534 | @@ -16,8 +16,6 @@ | |||
2535 | 16 | 16 | ||
2536 | 17 | """Tests for bzr-git's object store.""" | 17 | """Tests for bzr-git's object store.""" |
2537 | 18 | 18 | ||
2538 | 19 | from __future__ import absolute_import | ||
2539 | 20 | |||
2540 | 21 | from dulwich.objects import Blob | 19 | from dulwich.objects import Blob |
2541 | 22 | from dulwich.tests.test_object_store import PackBasedObjectStoreTests | 20 | from dulwich.tests.test_object_store import PackBasedObjectStoreTests |
2542 | 23 | from dulwich.tests.utils import make_object | 21 | from dulwich.tests.utils import make_object |
2543 | 24 | 22 | ||
2544 | === modified file 'breezy/git/tests/test_unpeel_map.py' | |||
2545 | --- breezy/git/tests/test_unpeel_map.py 2018-11-11 04:08:32 +0000 | |||
2546 | +++ breezy/git/tests/test_unpeel_map.py 2020-02-18 05:49:35 +0000 | |||
2547 | @@ -16,8 +16,6 @@ | |||
2548 | 16 | 16 | ||
2549 | 17 | """Tests for the unpeel map.""" | 17 | """Tests for the unpeel map.""" |
2550 | 18 | 18 | ||
2551 | 19 | from __future__ import absolute_import | ||
2552 | 20 | |||
2553 | 21 | from io import BytesIO | 19 | from io import BytesIO |
2554 | 22 | 20 | ||
2555 | 23 | from ...tests import ( | 21 | from ...tests import ( |
2556 | 24 | 22 | ||
2557 | === modified file 'breezy/git/tests/test_urls.py' | |||
2558 | --- breezy/git/tests/test_urls.py 2018-11-16 23:19:12 +0000 | |||
2559 | +++ breezy/git/tests/test_urls.py 2020-02-18 05:49:35 +0000 | |||
2560 | @@ -16,8 +16,6 @@ | |||
2561 | 16 | 16 | ||
2562 | 17 | """Tests for url handling.""" | 17 | """Tests for url handling.""" |
2563 | 18 | 18 | ||
2564 | 19 | from __future__ import absolute_import | ||
2565 | 20 | |||
2566 | 21 | from ...tests import TestCase | 19 | from ...tests import TestCase |
2567 | 22 | from ..urls import ( | 20 | from ..urls import ( |
2568 | 23 | git_url_to_bzr_url, | 21 | git_url_to_bzr_url, |
2569 | 24 | 22 | ||
2570 | === modified file 'breezy/git/tests/test_workingtree.py' | |||
2571 | --- breezy/git/tests/test_workingtree.py 2020-01-19 15:14:16 +0000 | |||
2572 | +++ breezy/git/tests/test_workingtree.py 2020-02-18 05:49:35 +0000 | |||
2573 | @@ -17,8 +17,6 @@ | |||
2574 | 17 | 17 | ||
2575 | 18 | """Tests for Git working trees.""" | 18 | """Tests for Git working trees.""" |
2576 | 19 | 19 | ||
2577 | 20 | from __future__ import absolute_import | ||
2578 | 21 | |||
2579 | 22 | import os | 20 | import os |
2580 | 23 | import stat | 21 | import stat |
2581 | 24 | 22 | ||
2582 | 25 | 23 | ||
2583 | === modified file 'breezy/git/transportgit.py' | |||
2584 | --- breezy/git/transportgit.py 2019-12-26 13:20:45 +0000 | |||
2585 | +++ breezy/git/transportgit.py 2020-02-18 05:49:35 +0000 | |||
2586 | @@ -16,8 +16,6 @@ | |||
2587 | 16 | 16 | ||
2588 | 17 | """A Git repository implementation that uses a Bazaar transport.""" | 17 | """A Git repository implementation that uses a Bazaar transport.""" |
2589 | 18 | 18 | ||
2590 | 19 | from __future__ import absolute_import | ||
2591 | 20 | |||
2592 | 21 | from io import BytesIO | 19 | from io import BytesIO |
2593 | 22 | 20 | ||
2594 | 23 | import os | 21 | import os |
2595 | 24 | 22 | ||
2596 | === modified file 'breezy/git/tree.py' | |||
2597 | --- breezy/git/tree.py 2020-02-13 23:57:28 +0000 | |||
2598 | +++ breezy/git/tree.py 2020-02-18 05:49:35 +0000 | |||
2599 | @@ -17,8 +17,6 @@ | |||
2600 | 17 | 17 | ||
2601 | 18 | """Git Trees.""" | 18 | """Git Trees.""" |
2602 | 19 | 19 | ||
2603 | 20 | from __future__ import absolute_import | ||
2604 | 21 | |||
2605 | 22 | from collections import deque | 20 | from collections import deque |
2606 | 23 | import errno | 21 | import errno |
2607 | 24 | from io import BytesIO | 22 | from io import BytesIO |
2608 | 25 | 23 | ||
2609 | === modified file 'breezy/git/unpeel_map.py' | |||
2610 | --- breezy/git/unpeel_map.py 2019-06-29 19:54:32 +0000 | |||
2611 | +++ breezy/git/unpeel_map.py 2020-02-18 05:49:35 +0000 | |||
2612 | @@ -16,7 +16,6 @@ | |||
2613 | 16 | 16 | ||
2614 | 17 | """Unpeel map storage.""" | 17 | """Unpeel map storage.""" |
2615 | 18 | 18 | ||
2616 | 19 | from __future__ import absolute_import | ||
2617 | 20 | 19 | ||
2618 | 21 | from collections import defaultdict | 20 | from collections import defaultdict |
2619 | 22 | from io import BytesIO | 21 | from io import BytesIO |
2620 | 23 | 22 | ||
2621 | === modified file 'breezy/git/urls.py' | |||
2622 | --- breezy/git/urls.py 2018-11-16 23:19:12 +0000 | |||
2623 | +++ breezy/git/urls.py 2020-02-18 05:49:35 +0000 | |||
2624 | @@ -16,7 +16,6 @@ | |||
2625 | 16 | 16 | ||
2626 | 17 | """URL Conversion.""" | 17 | """URL Conversion.""" |
2627 | 18 | 18 | ||
2628 | 19 | from __future__ import absolute_import | ||
2629 | 20 | 19 | ||
2630 | 21 | from .. import urlutils | 20 | from .. import urlutils |
2631 | 22 | from .refs import ( | 21 | from .refs import ( |
2632 | 23 | 22 | ||
2633 | === modified file 'breezy/git/workingtree.py' | |||
2634 | --- breezy/git/workingtree.py 2020-02-07 02:14:30 +0000 | |||
2635 | +++ breezy/git/workingtree.py 2020-02-18 05:49:35 +0000 | |||
2636 | @@ -17,8 +17,6 @@ | |||
2637 | 17 | 17 | ||
2638 | 18 | """An adapter between a Git index and a Bazaar Working Tree""" | 18 | """An adapter between a Git index and a Bazaar Working Tree""" |
2639 | 19 | 19 | ||
2640 | 20 | from __future__ import absolute_import | ||
2641 | 21 | |||
2642 | 22 | import itertools | 20 | import itertools |
2643 | 23 | from collections import defaultdict | 21 | from collections import defaultdict |
2644 | 24 | import errno | 22 | import errno |
2645 | 25 | 23 | ||
2646 | === modified file 'breezy/globbing.py' | |||
2647 | --- breezy/globbing.py 2019-02-15 17:41:17 +0000 | |||
2648 | +++ breezy/globbing.py 2020-02-18 05:49:35 +0000 | |||
2649 | @@ -20,8 +20,6 @@ | |||
2650 | 20 | expressions. | 20 | expressions. |
2651 | 21 | """ | 21 | """ |
2652 | 22 | 22 | ||
2653 | 23 | from __future__ import absolute_import | ||
2654 | 24 | |||
2655 | 25 | import re | 23 | import re |
2656 | 26 | 24 | ||
2657 | 27 | from . import ( | 25 | from . import ( |
2658 | 28 | 26 | ||
2659 | === modified file 'breezy/gpg.py' | |||
2660 | --- breezy/gpg.py 2020-02-07 02:14:30 +0000 | |||
2661 | +++ breezy/gpg.py 2020-02-18 05:49:35 +0000 | |||
2662 | @@ -17,8 +17,6 @@ | |||
2663 | 17 | 17 | ||
2664 | 18 | """GPG signing and checking logic.""" | 18 | """GPG signing and checking logic.""" |
2665 | 19 | 19 | ||
2666 | 20 | from __future__ import absolute_import | ||
2667 | 21 | |||
2668 | 22 | import os | 20 | import os |
2669 | 23 | 21 | ||
2670 | 24 | from breezy.lazy_import import lazy_import | 22 | from breezy.lazy_import import lazy_import |
2671 | 25 | 23 | ||
2672 | === modified file 'breezy/graph.py' | |||
2673 | --- breezy/graph.py 2020-02-07 02:14:30 +0000 | |||
2674 | +++ breezy/graph.py 2020-02-18 05:49:35 +0000 | |||
2675 | @@ -14,8 +14,6 @@ | |||
2676 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
2677 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2678 | 16 | 16 | ||
2679 | 17 | from __future__ import absolute_import | ||
2680 | 18 | |||
2681 | 19 | import time | 17 | import time |
2682 | 20 | 18 | ||
2683 | 21 | from . import ( | 19 | from . import ( |
2684 | 22 | 20 | ||
2685 | === modified file 'breezy/grep.py' | |||
2686 | --- breezy/grep.py 2020-02-07 02:14:30 +0000 | |||
2687 | +++ breezy/grep.py 2020-02-18 05:49:35 +0000 | |||
2688 | @@ -14,8 +14,6 @@ | |||
2689 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
2690 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2691 | 16 | 16 | ||
2692 | 17 | from __future__ import absolute_import | ||
2693 | 18 | |||
2694 | 19 | from io import BytesIO | 17 | from io import BytesIO |
2695 | 20 | import re | 18 | import re |
2696 | 21 | 19 | ||
2697 | 22 | 20 | ||
2698 | === modified file 'breezy/hashcache.py' | |||
2699 | --- breezy/hashcache.py 2020-02-07 02:14:30 +0000 | |||
2700 | +++ breezy/hashcache.py 2020-02-18 05:49:35 +0000 | |||
2701 | @@ -14,8 +14,6 @@ | |||
2702 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
2703 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2704 | 16 | 16 | ||
2705 | 17 | from __future__ import absolute_import | ||
2706 | 18 | |||
2707 | 19 | # TODO: Up-front, stat all files in order and remove those which are deleted or | 17 | # TODO: Up-front, stat all files in order and remove those which are deleted or |
2708 | 20 | # out-of-date. Don't actually re-read them until they're needed. That ought | 18 | # out-of-date. Don't actually re-read them until they're needed. That ought |
2709 | 21 | # to bring all the inodes into core so that future stats to them are fast, and | 19 | # to bring all the inodes into core so that future stats to them are fast, and |
2710 | 22 | 20 | ||
2711 | === modified file 'breezy/help.py' | |||
2712 | --- breezy/help.py 2018-11-11 04:08:32 +0000 | |||
2713 | +++ breezy/help.py 2020-02-18 05:49:35 +0000 | |||
2714 | @@ -14,8 +14,6 @@ | |||
2715 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
2716 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2717 | 16 | 16 | ||
2718 | 17 | from __future__ import absolute_import | ||
2719 | 18 | |||
2720 | 19 | # TODO: Some way to get a list of external commands (defined by shell | 17 | # TODO: Some way to get a list of external commands (defined by shell |
2721 | 20 | # scripts) so that they can be included in the help listing as well. | 18 | # scripts) so that they can be included in the help listing as well. |
2722 | 21 | # It should be enough to just list the plugin directory and look for | 19 | # It should be enough to just list the plugin directory and look for |
2723 | 22 | 20 | ||
2724 | === modified file 'breezy/help_topics/__init__.py' | |||
2725 | --- breezy/help_topics/__init__.py 2019-09-01 15:33:59 +0000 | |||
2726 | +++ breezy/help_topics/__init__.py 2020-02-18 05:49:35 +0000 | |||
2727 | @@ -33,8 +33,6 @@ | |||
2728 | 33 | rendering on the screen naturally. | 33 | rendering on the screen naturally. |
2729 | 34 | """ | 34 | """ |
2730 | 35 | 35 | ||
2731 | 36 | from __future__ import absolute_import | ||
2732 | 37 | |||
2733 | 38 | import breezy | 36 | import breezy |
2734 | 39 | from breezy import ( | 37 | from breezy import ( |
2735 | 40 | config, | 38 | config, |
2736 | 41 | 39 | ||
2737 | === modified file 'breezy/hooks.py' | |||
2738 | --- breezy/hooks.py 2018-11-11 04:08:32 +0000 | |||
2739 | +++ breezy/hooks.py 2020-02-18 05:49:35 +0000 | |||
2740 | @@ -16,8 +16,6 @@ | |||
2741 | 16 | 16 | ||
2742 | 17 | """Support for plugin hooking logic.""" | 17 | """Support for plugin hooking logic.""" |
2743 | 18 | 18 | ||
2744 | 19 | from __future__ import absolute_import | ||
2745 | 20 | |||
2746 | 21 | from . import ( | 19 | from . import ( |
2747 | 22 | errors, | 20 | errors, |
2748 | 23 | registry, | 21 | registry, |
2749 | 24 | 22 | ||
2750 | === modified file 'breezy/i18n.py' | |||
2751 | --- breezy/i18n.py 2020-02-07 02:14:30 +0000 | |||
2752 | +++ breezy/i18n.py 2020-02-18 05:49:35 +0000 | |||
2753 | @@ -22,8 +22,6 @@ | |||
2754 | 22 | 22 | ||
2755 | 23 | """i18n and l10n support for Bazaar.""" | 23 | """i18n and l10n support for Bazaar.""" |
2756 | 24 | 24 | ||
2757 | 25 | from __future__ import absolute_import | ||
2758 | 26 | |||
2759 | 27 | import gettext as _gettext | 25 | import gettext as _gettext |
2760 | 28 | import os | 26 | import os |
2761 | 29 | import sys | 27 | import sys |
2762 | 30 | 28 | ||
2763 | === modified file 'breezy/identitymap.py' | |||
2764 | --- breezy/identitymap.py 2017-05-22 00:56:52 +0000 | |||
2765 | +++ breezy/identitymap.py 2020-02-18 05:49:35 +0000 | |||
2766 | @@ -17,8 +17,6 @@ | |||
2767 | 17 | 17 | ||
2768 | 18 | """This module provides an IdentityMap.""" | 18 | """This module provides an IdentityMap.""" |
2769 | 19 | 19 | ||
2770 | 20 | from __future__ import absolute_import | ||
2771 | 21 | |||
2772 | 22 | from . import ( | 20 | from . import ( |
2773 | 23 | errors, | 21 | errors, |
2774 | 24 | ) | 22 | ) |
2775 | 25 | 23 | ||
2776 | === modified file 'breezy/ignores.py' | |||
2777 | --- breezy/ignores.py 2020-01-11 17:41:33 +0000 | |||
2778 | +++ breezy/ignores.py 2020-02-18 05:49:35 +0000 | |||
2779 | @@ -16,8 +16,6 @@ | |||
2780 | 16 | 16 | ||
2781 | 17 | """Lists of ignore files, etc.""" | 17 | """Lists of ignore files, etc.""" |
2782 | 18 | 18 | ||
2783 | 19 | from __future__ import absolute_import | ||
2784 | 20 | |||
2785 | 21 | import errno | 19 | import errno |
2786 | 22 | from io import BytesIO | 20 | from io import BytesIO |
2787 | 23 | import os | 21 | import os |
2788 | 24 | 22 | ||
2789 | === modified file 'breezy/info.py' | |||
2790 | --- breezy/info.py 2019-11-19 18:10:28 +0000 | |||
2791 | +++ breezy/info.py 2020-02-18 05:49:35 +0000 | |||
2792 | @@ -14,8 +14,6 @@ | |||
2793 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
2794 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2795 | 16 | 16 | ||
2796 | 17 | from __future__ import absolute_import | ||
2797 | 18 | |||
2798 | 19 | __all__ = ['show_bzrdir_info'] | 17 | __all__ = ['show_bzrdir_info'] |
2799 | 20 | 18 | ||
2800 | 21 | from io import StringIO | 19 | from io import StringIO |
2801 | 22 | 20 | ||
2802 | === modified file 'breezy/inter.py' | |||
2803 | --- breezy/inter.py 2017-08-29 13:25:07 +0000 | |||
2804 | +++ breezy/inter.py 2020-02-18 05:49:35 +0000 | |||
2805 | @@ -16,8 +16,6 @@ | |||
2806 | 16 | 16 | ||
2807 | 17 | """Inter-object utility class.""" | 17 | """Inter-object utility class.""" |
2808 | 18 | 18 | ||
2809 | 19 | from __future__ import absolute_import | ||
2810 | 20 | |||
2811 | 21 | from .errors import BzrError | 19 | from .errors import BzrError |
2812 | 22 | from .lock import LogicalLockResult | 20 | from .lock import LogicalLockResult |
2813 | 23 | 21 | ||
2814 | 24 | 22 | ||
2815 | === removed file 'breezy/intset.py' | |||
2816 | === modified file 'breezy/iterablefile.py' | |||
2817 | --- breezy/iterablefile.py 2020-02-07 02:14:30 +0000 | |||
2818 | +++ breezy/iterablefile.py 2020-02-18 05:49:35 +0000 | |||
2819 | @@ -15,8 +15,6 @@ | |||
2820 | 15 | # along with this program; if not, write to the Free Software | 15 | # along with this program; if not, write to the Free Software |
2821 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2822 | 17 | 17 | ||
2823 | 18 | from __future__ import absolute_import | ||
2824 | 19 | |||
2825 | 20 | 18 | ||
2826 | 21 | class IterableFileBase(object): | 19 | class IterableFileBase(object): |
2827 | 22 | """Create a file-like object from any iterable""" | 20 | """Create a file-like object from any iterable""" |
2828 | 23 | 21 | ||
2829 | === modified file 'breezy/lazy_import.py' | |||
2830 | --- breezy/lazy_import.py 2020-01-11 17:41:33 +0000 | |||
2831 | +++ breezy/lazy_import.py 2020-02-18 05:49:35 +0000 | |||
2832 | @@ -41,8 +41,6 @@ | |||
2833 | 41 | to inherit from them). | 41 | to inherit from them). |
2834 | 42 | """ | 42 | """ |
2835 | 43 | 43 | ||
2836 | 44 | from __future__ import absolute_import | ||
2837 | 45 | |||
2838 | 46 | from .errors import BzrError, InternalBzrError | 44 | from .errors import BzrError, InternalBzrError |
2839 | 47 | 45 | ||
2840 | 48 | 46 | ||
2841 | 49 | 47 | ||
2842 | === modified file 'breezy/lazy_regex.py' | |||
2843 | --- breezy/lazy_regex.py 2018-11-16 19:09:31 +0000 | |||
2844 | +++ breezy/lazy_regex.py 2020-02-18 05:49:35 +0000 | |||
2845 | @@ -24,8 +24,6 @@ | |||
2846 | 24 | be used by existing Python modules that create regexs. | 24 | be used by existing Python modules that create regexs. |
2847 | 25 | """ | 25 | """ |
2848 | 26 | 26 | ||
2849 | 27 | from __future__ import absolute_import | ||
2850 | 28 | |||
2851 | 29 | import re | 27 | import re |
2852 | 30 | 28 | ||
2853 | 31 | from . import errors | 29 | from . import errors |
2854 | 32 | 30 | ||
2855 | === modified file 'breezy/library_state.py' | |||
2856 | --- breezy/library_state.py 2020-02-07 02:14:30 +0000 | |||
2857 | +++ breezy/library_state.py 2020-02-18 05:49:35 +0000 | |||
2858 | @@ -16,8 +16,6 @@ | |||
2859 | 16 | 16 | ||
2860 | 17 | """The core state needed to make use of bzr is managed here.""" | 17 | """The core state needed to make use of bzr is managed here.""" |
2861 | 18 | 18 | ||
2862 | 19 | from __future__ import absolute_import | ||
2863 | 20 | |||
2864 | 21 | __all__ = [ | 19 | __all__ = [ |
2865 | 22 | 'BzrLibraryState', | 20 | 'BzrLibraryState', |
2866 | 23 | ] | 21 | ] |
2867 | 24 | 22 | ||
2868 | === modified file 'breezy/location.py' | |||
2869 | --- breezy/location.py 2020-02-07 02:14:30 +0000 | |||
2870 | +++ breezy/location.py 2020-02-18 05:49:35 +0000 | |||
2871 | @@ -17,8 +17,6 @@ | |||
2872 | 17 | 17 | ||
2873 | 18 | """UI location string handling.""" | 18 | """UI location string handling.""" |
2874 | 19 | 19 | ||
2875 | 20 | from __future__ import absolute_import | ||
2876 | 21 | |||
2877 | 22 | import re | 20 | import re |
2878 | 23 | 21 | ||
2879 | 24 | from . import ( | 22 | from . import ( |
2880 | 25 | 23 | ||
2881 | === modified file 'breezy/lock.py' | |||
2882 | --- breezy/lock.py 2019-06-16 15:37:44 +0000 | |||
2883 | +++ breezy/lock.py 2020-02-18 05:49:35 +0000 | |||
2884 | @@ -33,8 +33,6 @@ | |||
2885 | 33 | unlock() method. | 33 | unlock() method. |
2886 | 34 | """ | 34 | """ |
2887 | 35 | 35 | ||
2888 | 36 | from __future__ import absolute_import | ||
2889 | 37 | |||
2890 | 38 | import contextlib | 36 | import contextlib |
2891 | 39 | import errno | 37 | import errno |
2892 | 40 | import os | 38 | import os |
2893 | 41 | 39 | ||
2894 | === modified file 'breezy/lockable_files.py' | |||
2895 | --- breezy/lockable_files.py 2020-01-11 17:41:33 +0000 | |||
2896 | +++ breezy/lockable_files.py 2020-02-18 05:49:35 +0000 | |||
2897 | @@ -14,8 +14,6 @@ | |||
2898 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
2899 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2900 | 16 | 16 | ||
2901 | 17 | from __future__ import absolute_import | ||
2902 | 18 | |||
2903 | 19 | from .lazy_import import lazy_import | 17 | from .lazy_import import lazy_import |
2904 | 20 | lazy_import(globals(), """ | 18 | lazy_import(globals(), """ |
2905 | 21 | from breezy import ( | 19 | from breezy import ( |
2906 | 22 | 20 | ||
2907 | === modified file 'breezy/lockdir.py' | |||
2908 | --- breezy/lockdir.py 2020-02-07 02:14:30 +0000 | |||
2909 | +++ breezy/lockdir.py 2020-02-18 05:49:35 +0000 | |||
2910 | @@ -98,8 +98,6 @@ | |||
2911 | 98 | but helps protect against colliding host names. | 98 | but helps protect against colliding host names. |
2912 | 99 | """ | 99 | """ |
2913 | 100 | 100 | ||
2914 | 101 | from __future__ import absolute_import | ||
2915 | 102 | |||
2916 | 103 | 101 | ||
2917 | 104 | # TODO: We sometimes have the problem that our attempt to rename '1234' to | 102 | # TODO: We sometimes have the problem that our attempt to rename '1234' to |
2918 | 105 | # 'held' fails because the transport server moves into an existing directory, | 103 | # 'held' fails because the transport server moves into an existing directory, |
2919 | 106 | 104 | ||
2920 | === modified file 'breezy/log.py' | |||
2921 | --- breezy/log.py 2020-02-13 23:57:28 +0000 | |||
2922 | +++ breezy/log.py 2020-02-18 05:49:35 +0000 | |||
2923 | @@ -47,8 +47,6 @@ | |||
2924 | 47 | all the changes since the previous revision that touched hello.c. | 47 | all the changes since the previous revision that touched hello.c. |
2925 | 48 | """ | 48 | """ |
2926 | 49 | 49 | ||
2927 | 50 | from __future__ import absolute_import | ||
2928 | 51 | |||
2929 | 52 | import codecs | 50 | import codecs |
2930 | 53 | from io import BytesIO | 51 | from io import BytesIO |
2931 | 54 | import itertools | 52 | import itertools |
2932 | 55 | 53 | ||
2933 | === modified file 'breezy/lru_cache.py' | |||
2934 | --- breezy/lru_cache.py 2020-02-07 02:14:30 +0000 | |||
2935 | +++ breezy/lru_cache.py 2020-02-18 05:49:35 +0000 | |||
2936 | @@ -16,8 +16,6 @@ | |||
2937 | 16 | 16 | ||
2938 | 17 | """A simple least-recently-used (LRU) cache.""" | 17 | """A simple least-recently-used (LRU) cache.""" |
2939 | 18 | 18 | ||
2940 | 19 | from __future__ import absolute_import, division | ||
2941 | 20 | |||
2942 | 21 | from . import ( | 19 | from . import ( |
2943 | 22 | trace, | 20 | trace, |
2944 | 23 | ) | 21 | ) |
2945 | 24 | 22 | ||
2946 | === modified file 'breezy/lsprof.py' | |||
2947 | --- breezy/lsprof.py 2020-02-07 02:14:30 +0000 | |||
2948 | +++ breezy/lsprof.py 2020-02-18 05:49:35 +0000 | |||
2949 | @@ -3,8 +3,6 @@ | |||
2950 | 3 | # I made one modification to profile so that it returns a pair | 3 | # I made one modification to profile so that it returns a pair |
2951 | 4 | # instead of just the Stats object | 4 | # instead of just the Stats object |
2952 | 5 | 5 | ||
2953 | 6 | from __future__ import absolute_import | ||
2954 | 7 | |||
2955 | 8 | import codecs | 6 | import codecs |
2956 | 9 | try: | 7 | try: |
2957 | 10 | import cPickle as pickle | 8 | import cPickle as pickle |
2958 | 11 | 9 | ||
2959 | === modified file 'breezy/mail_client.py' | |||
2960 | --- breezy/mail_client.py 2020-02-07 02:14:30 +0000 | |||
2961 | +++ breezy/mail_client.py 2020-02-18 05:49:35 +0000 | |||
2962 | @@ -14,8 +14,6 @@ | |||
2963 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
2964 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2965 | 16 | 16 | ||
2966 | 17 | from __future__ import absolute_import | ||
2967 | 18 | |||
2968 | 19 | import errno | 17 | import errno |
2969 | 20 | import os | 18 | import os |
2970 | 21 | import subprocess | 19 | import subprocess |
2971 | 22 | 20 | ||
2972 | === modified file 'breezy/memorytree.py' | |||
2973 | --- breezy/memorytree.py 2019-10-14 00:25:24 +0000 | |||
2974 | +++ breezy/memorytree.py 2020-02-18 05:49:35 +0000 | |||
2975 | @@ -19,8 +19,6 @@ | |||
2976 | 19 | See MemoryTree for more details. | 19 | See MemoryTree for more details. |
2977 | 20 | """ | 20 | """ |
2978 | 21 | 21 | ||
2979 | 22 | from __future__ import absolute_import | ||
2980 | 23 | |||
2981 | 24 | import os | 22 | import os |
2982 | 25 | import stat | 23 | import stat |
2983 | 26 | 24 | ||
2984 | 27 | 25 | ||
2985 | === modified file 'breezy/merge.py' | |||
2986 | --- breezy/merge.py 2020-02-07 02:14:30 +0000 | |||
2987 | +++ breezy/merge.py 2020-02-18 05:49:35 +0000 | |||
2988 | @@ -14,8 +14,6 @@ | |||
2989 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
2990 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2991 | 16 | 16 | ||
2992 | 17 | from __future__ import absolute_import | ||
2993 | 18 | |||
2994 | 19 | import contextlib | 17 | import contextlib |
2995 | 20 | 18 | ||
2996 | 21 | from .lazy_import import lazy_import | 19 | from .lazy_import import lazy_import |
2997 | 22 | 20 | ||
2998 | === modified file 'breezy/merge3.py' | |||
2999 | --- breezy/merge3.py 2019-03-02 21:46:18 +0000 | |||
3000 | +++ breezy/merge3.py 2020-02-18 05:49:35 +0000 | |||
3001 | @@ -14,8 +14,6 @@ | |||
3002 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3003 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3004 | 16 | 16 | ||
3005 | 17 | from __future__ import absolute_import | ||
3006 | 18 | |||
3007 | 19 | # mbp: "you know that thing where cvs gives you conflict markers?" | 17 | # mbp: "you know that thing where cvs gives you conflict markers?" |
3008 | 20 | # s: "i hate that." | 18 | # s: "i hate that." |
3009 | 21 | 19 | ||
3010 | 22 | 20 | ||
3011 | === modified file 'breezy/merge_directive.py' | |||
3012 | --- breezy/merge_directive.py 2020-02-07 02:14:30 +0000 | |||
3013 | +++ breezy/merge_directive.py 2020-02-18 05:49:35 +0000 | |||
3014 | @@ -14,8 +14,6 @@ | |||
3015 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3016 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3017 | 16 | 16 | ||
3018 | 17 | from __future__ import absolute_import | ||
3019 | 18 | |||
3020 | 19 | import base64 | 17 | import base64 |
3021 | 20 | import contextlib | 18 | import contextlib |
3022 | 21 | from io import BytesIO | 19 | from io import BytesIO |
3023 | 22 | 20 | ||
3024 | === modified file 'breezy/mergeable.py' | |||
3025 | --- breezy/mergeable.py 2020-02-07 02:14:30 +0000 | |||
3026 | +++ breezy/mergeable.py 2020-02-18 05:49:35 +0000 | |||
3027 | @@ -14,8 +14,6 @@ | |||
3028 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3029 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3030 | 16 | 16 | ||
3031 | 17 | from __future__ import absolute_import | ||
3032 | 18 | |||
3033 | 19 | from io import BytesIO | 17 | from io import BytesIO |
3034 | 20 | 18 | ||
3035 | 21 | from .lazy_import import lazy_import | 19 | from .lazy_import import lazy_import |
3036 | 22 | 20 | ||
3037 | === modified file 'breezy/mergetools.py' | |||
3038 | --- breezy/mergetools.py 2018-11-12 01:41:38 +0000 | |||
3039 | +++ breezy/mergetools.py 2020-02-18 05:49:35 +0000 | |||
3040 | @@ -16,8 +16,6 @@ | |||
3041 | 16 | 16 | ||
3042 | 17 | """Utility functions for managing external merge tools such as kdiff3.""" | 17 | """Utility functions for managing external merge tools such as kdiff3.""" |
3043 | 18 | 18 | ||
3044 | 19 | from __future__ import absolute_import | ||
3045 | 20 | |||
3046 | 21 | import os | 19 | import os |
3047 | 22 | import shutil | 20 | import shutil |
3048 | 23 | import subprocess | 21 | import subprocess |
3049 | 24 | 22 | ||
3050 | === modified file 'breezy/missing.py' | |||
3051 | --- breezy/missing.py 2019-06-26 20:58:23 +0000 | |||
3052 | +++ breezy/missing.py 2020-02-18 05:49:35 +0000 | |||
3053 | @@ -16,8 +16,6 @@ | |||
3054 | 16 | 16 | ||
3055 | 17 | """Display what revisions are missing in 'other' from 'this' and vice versa.""" | 17 | """Display what revisions are missing in 'other' from 'this' and vice versa.""" |
3056 | 18 | 18 | ||
3057 | 19 | from __future__ import absolute_import | ||
3058 | 20 | |||
3059 | 21 | from . import ( | 19 | from . import ( |
3060 | 22 | errors, | 20 | errors, |
3061 | 23 | log, | 21 | log, |
3062 | 24 | 22 | ||
3063 | === modified file 'breezy/msgeditor.py' | |||
3064 | --- breezy/msgeditor.py 2020-02-07 02:14:30 +0000 | |||
3065 | +++ breezy/msgeditor.py 2020-02-18 05:49:35 +0000 | |||
3066 | @@ -16,8 +16,6 @@ | |||
3067 | 16 | 16 | ||
3068 | 17 | """Commit message editor support.""" | 17 | """Commit message editor support.""" |
3069 | 18 | 18 | ||
3070 | 19 | from __future__ import absolute_import | ||
3071 | 20 | |||
3072 | 21 | import codecs | 19 | import codecs |
3073 | 22 | from io import ( | 20 | from io import ( |
3074 | 23 | BytesIO, | 21 | BytesIO, |
3075 | 24 | 22 | ||
3076 | === modified file 'breezy/multiparent.py' | |||
3077 | --- breezy/multiparent.py 2020-02-07 02:14:30 +0000 | |||
3078 | +++ breezy/multiparent.py 2020-02-18 05:49:35 +0000 | |||
3079 | @@ -14,8 +14,6 @@ | |||
3080 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3081 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3082 | 16 | 16 | ||
3083 | 17 | from __future__ import absolute_import | ||
3084 | 18 | |||
3085 | 19 | import errno | 17 | import errno |
3086 | 20 | from io import ( | 18 | from io import ( |
3087 | 21 | BytesIO, | 19 | BytesIO, |
3088 | 22 | 20 | ||
3089 | === modified file 'breezy/multiwalker.py' | |||
3090 | --- breezy/multiwalker.py 2020-02-07 02:14:30 +0000 | |||
3091 | +++ breezy/multiwalker.py 2020-02-18 05:49:35 +0000 | |||
3092 | @@ -17,8 +17,6 @@ | |||
3093 | 17 | """Walk multiple trees simultaneously. | 17 | """Walk multiple trees simultaneously. |
3094 | 18 | """ | 18 | """ |
3095 | 19 | 19 | ||
3096 | 20 | from __future__ import absolute_import | ||
3097 | 21 | |||
3098 | 22 | from . import ( | 20 | from . import ( |
3099 | 23 | errors, | 21 | errors, |
3100 | 24 | osutils, | 22 | osutils, |
3101 | 25 | 23 | ||
3102 | === modified file 'breezy/mutabletree.py' | |||
3103 | --- breezy/mutabletree.py 2020-02-07 02:14:30 +0000 | |||
3104 | +++ breezy/mutabletree.py 2020-02-18 05:49:35 +0000 | |||
3105 | @@ -19,8 +19,6 @@ | |||
3106 | 19 | See MutableTree for more details. | 19 | See MutableTree for more details. |
3107 | 20 | """ | 20 | """ |
3108 | 21 | 21 | ||
3109 | 22 | from __future__ import absolute_import | ||
3110 | 23 | |||
3111 | 24 | from . import ( | 22 | from . import ( |
3112 | 25 | errors, | 23 | errors, |
3113 | 26 | hooks, | 24 | hooks, |
3114 | 27 | 25 | ||
3115 | === modified file 'breezy/option.py' | |||
3116 | --- breezy/option.py 2020-02-07 02:14:30 +0000 | |||
3117 | +++ breezy/option.py 2020-02-18 05:49:35 +0000 | |||
3118 | @@ -17,8 +17,6 @@ | |||
3119 | 17 | # TODO: For things like --diff-prefix, we want a way to customize the display | 17 | # TODO: For things like --diff-prefix, we want a way to customize the display |
3120 | 18 | # of the option argument. | 18 | # of the option argument. |
3121 | 19 | 19 | ||
3122 | 20 | from __future__ import absolute_import | ||
3123 | 21 | |||
3124 | 22 | import optparse | 20 | import optparse |
3125 | 23 | import re | 21 | import re |
3126 | 24 | 22 | ||
3127 | 25 | 23 | ||
3128 | === modified file 'breezy/osutils.py' | |||
3129 | --- breezy/osutils.py 2020-02-07 02:14:30 +0000 | |||
3130 | +++ breezy/osutils.py 2020-02-18 05:49:35 +0000 | |||
3131 | @@ -14,8 +14,6 @@ | |||
3132 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3133 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3134 | 16 | 16 | ||
3135 | 17 | from __future__ import absolute_import | ||
3136 | 18 | |||
3137 | 19 | import errno | 17 | import errno |
3138 | 20 | import os | 18 | import os |
3139 | 21 | import re | 19 | import re |
3140 | 22 | 20 | ||
3141 | === modified file 'breezy/patch.py' | |||
3142 | --- breezy/patch.py 2019-12-22 12:06:17 +0000 | |||
3143 | +++ breezy/patch.py 2020-02-18 05:49:35 +0000 | |||
3144 | @@ -15,8 +15,6 @@ | |||
3145 | 15 | # along with this program; if not, write to the Free Software | 15 | # along with this program; if not, write to the Free Software |
3146 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3147 | 17 | 17 | ||
3148 | 18 | from __future__ import absolute_import | ||
3149 | 19 | |||
3150 | 20 | """Diff and patch functionality""" | 18 | """Diff and patch functionality""" |
3151 | 21 | 19 | ||
3152 | 22 | import errno | 20 | import errno |
3153 | 23 | 21 | ||
3154 | === modified file 'breezy/patches.py' | |||
3155 | --- breezy/patches.py 2019-12-28 14:10:36 +0000 | |||
3156 | +++ breezy/patches.py 2020-02-18 05:49:35 +0000 | |||
3157 | @@ -15,8 +15,6 @@ | |||
3158 | 15 | # along with this program; if not, write to the Free Software | 15 | # along with this program; if not, write to the Free Software |
3159 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3160 | 17 | 17 | ||
3161 | 18 | from __future__ import absolute_import | ||
3162 | 19 | |||
3163 | 20 | from .errors import ( | 18 | from .errors import ( |
3164 | 21 | BzrError, | 19 | BzrError, |
3165 | 22 | ) | 20 | ) |
3166 | 23 | 21 | ||
3167 | === modified file 'breezy/plugin.py' | |||
3168 | --- breezy/plugin.py 2020-02-07 02:14:30 +0000 | |||
3169 | +++ breezy/plugin.py 2020-02-18 05:49:35 +0000 | |||
3170 | @@ -34,8 +34,6 @@ | |||
3171 | 34 | plugins. | 34 | plugins. |
3172 | 35 | """ | 35 | """ |
3173 | 36 | 36 | ||
3174 | 37 | from __future__ import absolute_import | ||
3175 | 38 | |||
3176 | 39 | import os | 37 | import os |
3177 | 40 | import re | 38 | import re |
3178 | 41 | import sys | 39 | import sys |
3179 | 42 | 40 | ||
3180 | === modified file 'breezy/plugins/__init__.py' | |||
3181 | --- breezy/plugins/__init__.py 2017-06-02 23:43:00 +0000 | |||
3182 | +++ breezy/plugins/__init__.py 2020-02-18 05:49:35 +0000 | |||
3183 | @@ -16,8 +16,6 @@ | |||
3184 | 16 | 16 | ||
3185 | 17 | """Pseudo-namespace package for breezy plugins.""" | 17 | """Pseudo-namespace package for breezy plugins.""" |
3186 | 18 | 18 | ||
3187 | 19 | from __future__ import absolute_import | ||
3188 | 20 | |||
3189 | 21 | from breezy.plugin import extend_path | 19 | from breezy.plugin import extend_path |
3190 | 22 | 20 | ||
3191 | 23 | __path__ = extend_path(__path__, __name__) | 21 | __path__ = extend_path(__path__, __name__) |
3192 | 24 | 22 | ||
3193 | === modified file 'breezy/plugins/bash_completion/__init__.py' | |||
3194 | --- breezy/plugins/bash_completion/__init__.py 2018-11-11 04:08:32 +0000 | |||
3195 | +++ breezy/plugins/bash_completion/__init__.py 2020-02-18 05:49:35 +0000 | |||
3196 | @@ -14,8 +14,6 @@ | |||
3197 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3198 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3199 | 16 | 16 | ||
3200 | 17 | from __future__ import absolute_import | ||
3201 | 18 | |||
3202 | 19 | __doc__ = """Generate a shell function for bash command line completion. | 17 | __doc__ = """Generate a shell function for bash command line completion. |
3203 | 20 | 18 | ||
3204 | 21 | This plugin provides a command called bash-completion that generates a | 19 | This plugin provides a command called bash-completion that generates a |
3205 | 22 | 20 | ||
3206 | === modified file 'breezy/plugins/bash_completion/bashcomp.py' | |||
3207 | --- breezy/plugins/bash_completion/bashcomp.py 2020-02-07 02:14:30 +0000 | |||
3208 | +++ breezy/plugins/bash_completion/bashcomp.py 2020-02-18 05:49:35 +0000 | |||
3209 | @@ -16,8 +16,6 @@ | |||
3210 | 16 | # along with this program; if not, write to the Free Software | 16 | # along with this program; if not, write to the Free Software |
3211 | 17 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 17 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3212 | 18 | 18 | ||
3213 | 19 | from __future__ import absolute_import | ||
3214 | 20 | |||
3215 | 21 | from ... import ( | 19 | from ... import ( |
3216 | 22 | cmdline, | 20 | cmdline, |
3217 | 23 | commands, | 21 | commands, |
3218 | 24 | 22 | ||
3219 | === modified file 'breezy/plugins/changelog_merge/__init__.py' | |||
3220 | --- breezy/plugins/changelog_merge/__init__.py 2018-11-11 04:08:32 +0000 | |||
3221 | +++ breezy/plugins/changelog_merge/__init__.py 2020-02-18 05:49:35 +0000 | |||
3222 | @@ -14,8 +14,6 @@ | |||
3223 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3224 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3225 | 16 | 16 | ||
3226 | 17 | from __future__ import absolute_import | ||
3227 | 18 | |||
3228 | 19 | __doc__ = """Merge hook for GNU-format ChangeLog files | 17 | __doc__ = """Merge hook for GNU-format ChangeLog files |
3229 | 20 | 18 | ||
3230 | 21 | To enable this plugin, add a section to your locations.conf | 19 | To enable this plugin, add a section to your locations.conf |
3231 | 22 | 20 | ||
3232 | === modified file 'breezy/plugins/changelog_merge/changelog_merge.py' | |||
3233 | --- breezy/plugins/changelog_merge/changelog_merge.py 2018-11-11 04:08:32 +0000 | |||
3234 | +++ breezy/plugins/changelog_merge/changelog_merge.py 2020-02-18 05:49:35 +0000 | |||
3235 | @@ -16,8 +16,6 @@ | |||
3236 | 16 | 16 | ||
3237 | 17 | """Merge logic for changelog_merge plugin.""" | 17 | """Merge logic for changelog_merge plugin.""" |
3238 | 18 | 18 | ||
3239 | 19 | from __future__ import absolute_import | ||
3240 | 20 | |||
3241 | 21 | import difflib | 19 | import difflib |
3242 | 22 | 20 | ||
3243 | 23 | from ... import ( | 21 | from ... import ( |
3244 | 24 | 22 | ||
3245 | === modified file 'breezy/plugins/commitfromnews/__init__.py' | |||
3246 | --- breezy/plugins/commitfromnews/__init__.py 2019-10-13 16:49:05 +0000 | |||
3247 | +++ breezy/plugins/commitfromnews/__init__.py 2020-02-18 05:49:35 +0000 | |||
3248 | @@ -33,8 +33,6 @@ | |||
3249 | 33 | including sections from a NEWS or ChangeLog file. | 33 | including sections from a NEWS or ChangeLog file. |
3250 | 34 | """ | 34 | """ |
3251 | 35 | 35 | ||
3252 | 36 | from __future__ import absolute_import | ||
3253 | 37 | |||
3254 | 38 | from ... import version_info # noqa: F401 | 36 | from ... import version_info # noqa: F401 |
3255 | 39 | from ... import hooks | 37 | from ... import hooks |
3256 | 40 | from ...config import ( | 38 | from ...config import ( |
3257 | 41 | 39 | ||
3258 | === modified file 'breezy/plugins/commitfromnews/committemplate.py' | |||
3259 | --- breezy/plugins/commitfromnews/committemplate.py 2019-03-02 21:46:18 +0000 | |||
3260 | +++ breezy/plugins/commitfromnews/committemplate.py 2020-02-18 05:49:35 +0000 | |||
3261 | @@ -16,8 +16,6 @@ | |||
3262 | 16 | 16 | ||
3263 | 17 | """Logic to create commit templates.""" | 17 | """Logic to create commit templates.""" |
3264 | 18 | 18 | ||
3265 | 19 | from __future__ import absolute_import | ||
3266 | 20 | |||
3267 | 21 | import patiencediff | 19 | import patiencediff |
3268 | 22 | 20 | ||
3269 | 23 | from ... import bugtracker, osutils | 21 | from ... import bugtracker, osutils |
3270 | 24 | 22 | ||
3271 | === modified file 'breezy/plugins/commitfromnews/tests/__init__.py' | |||
3272 | --- breezy/plugins/commitfromnews/tests/__init__.py 2019-10-27 18:22:53 +0000 | |||
3273 | +++ breezy/plugins/commitfromnews/tests/__init__.py 2020-02-18 05:49:35 +0000 | |||
3274 | @@ -16,8 +16,6 @@ | |||
3275 | 16 | 16 | ||
3276 | 17 | """Tests for commitfromnews.""" | 17 | """Tests for commitfromnews.""" |
3277 | 18 | 18 | ||
3278 | 19 | from __future__ import absolute_import | ||
3279 | 20 | |||
3280 | 21 | 19 | ||
3281 | 22 | def load_tests(loader, basic_tests, pattern): | 20 | def load_tests(loader, basic_tests, pattern): |
3282 | 23 | testmod_names = [ | 21 | testmod_names = [ |
3283 | 24 | 22 | ||
3284 | === modified file 'breezy/plugins/commitfromnews/tests/test_committemplate.py' | |||
3285 | --- breezy/plugins/commitfromnews/tests/test_committemplate.py 2018-11-11 04:08:32 +0000 | |||
3286 | +++ breezy/plugins/commitfromnews/tests/test_committemplate.py 2020-02-18 05:49:35 +0000 | |||
3287 | @@ -16,8 +16,6 @@ | |||
3288 | 16 | 16 | ||
3289 | 17 | """Tests for the commit template creation.""" | 17 | """Tests for the commit template creation.""" |
3290 | 18 | 18 | ||
3291 | 19 | from __future__ import absolute_import | ||
3292 | 20 | |||
3293 | 21 | from ... import commitfromnews | 19 | from ... import commitfromnews |
3294 | 22 | from .... import ( | 20 | from .... import ( |
3295 | 23 | config, | 21 | config, |
3296 | 24 | 22 | ||
3297 | === modified file 'breezy/plugins/commitfromnews/tests/test_msgeditor.py' | |||
3298 | --- breezy/plugins/commitfromnews/tests/test_msgeditor.py 2017-06-13 00:17:21 +0000 | |||
3299 | +++ breezy/plugins/commitfromnews/tests/test_msgeditor.py 2020-02-18 05:49:35 +0000 | |||
3300 | @@ -16,8 +16,6 @@ | |||
3301 | 16 | 16 | ||
3302 | 17 | """Tests for msg editor interactions..""" | 17 | """Tests for msg editor interactions..""" |
3303 | 18 | 18 | ||
3304 | 19 | from __future__ import absolute_import | ||
3305 | 20 | |||
3306 | 21 | from ... import commitfromnews | 19 | from ... import commitfromnews |
3307 | 22 | from .... import msgeditor | 20 | from .... import msgeditor |
3308 | 23 | from ....tests import TestCaseWithTransport | 21 | from ....tests import TestCaseWithTransport |
3309 | 24 | 22 | ||
3310 | === modified file 'breezy/plugins/cvs/__init__.py' | |||
3311 | --- breezy/plugins/cvs/__init__.py 2019-12-22 13:21:36 +0000 | |||
3312 | +++ breezy/plugins/cvs/__init__.py 2020-02-18 05:49:35 +0000 | |||
3313 | @@ -19,8 +19,6 @@ | |||
3314 | 19 | Currently limited to referencing tools for migration. | 19 | Currently limited to referencing tools for migration. |
3315 | 20 | """ | 20 | """ |
3316 | 21 | 21 | ||
3317 | 22 | from __future__ import absolute_import | ||
3318 | 23 | |||
3319 | 24 | from ... import version_info # noqa: F401 | 22 | from ... import version_info # noqa: F401 |
3320 | 25 | 23 | ||
3321 | 26 | from ... import ( | 24 | from ... import ( |
3322 | 27 | 25 | ||
3323 | === modified file 'breezy/plugins/darcs/__init__.py' | |||
3324 | --- breezy/plugins/darcs/__init__.py 2019-11-06 01:31:41 +0000 | |||
3325 | +++ breezy/plugins/darcs/__init__.py 2020-02-18 05:49:35 +0000 | |||
3326 | @@ -19,8 +19,6 @@ | |||
3327 | 19 | Currently only tells the user to use fastimport/fastexport. | 19 | Currently only tells the user to use fastimport/fastexport. |
3328 | 20 | """ | 20 | """ |
3329 | 21 | 21 | ||
3330 | 22 | from __future__ import absolute_import | ||
3331 | 23 | |||
3332 | 24 | from ... import version_info # noqa: F401 | 22 | from ... import version_info # noqa: F401 |
3333 | 25 | from breezy import ( | 23 | from breezy import ( |
3334 | 26 | controldir, | 24 | controldir, |
3335 | 27 | 25 | ||
3336 | === modified file 'breezy/plugins/email/__init__.py' | |||
3337 | --- breezy/plugins/email/__init__.py 2019-10-13 16:49:05 +0000 | |||
3338 | +++ breezy/plugins/email/__init__.py 2020-02-18 05:49:35 +0000 | |||
3339 | @@ -64,8 +64,6 @@ | |||
3340 | 64 | revision_mail_headers=X-Cheese: to the rescue! | 64 | revision_mail_headers=X-Cheese: to the rescue! |
3341 | 65 | """ | 65 | """ |
3342 | 66 | 66 | ||
3343 | 67 | from __future__ import absolute_import | ||
3344 | 68 | |||
3345 | 69 | from ... import version_info # noqa: F401 | 67 | from ... import version_info # noqa: F401 |
3346 | 70 | from ...config import option_registry | 68 | from ...config import option_registry |
3347 | 71 | 69 | ||
3348 | 72 | 70 | ||
3349 | === modified file 'breezy/plugins/email/emailer.py' | |||
3350 | --- breezy/plugins/email/emailer.py 2020-02-07 02:14:30 +0000 | |||
3351 | +++ breezy/plugins/email/emailer.py 2020-02-18 05:49:35 +0000 | |||
3352 | @@ -14,8 +14,6 @@ | |||
3353 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3354 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
3355 | 16 | 16 | ||
3356 | 17 | from __future__ import absolute_import | ||
3357 | 18 | |||
3358 | 19 | import subprocess | 17 | import subprocess |
3359 | 20 | import tempfile | 18 | import tempfile |
3360 | 21 | 19 | ||
3361 | 22 | 20 | ||
3362 | === modified file 'breezy/plugins/fastimport/__init__.py' | |||
3363 | --- breezy/plugins/fastimport/__init__.py 2019-10-13 16:49:05 +0000 | |||
3364 | +++ breezy/plugins/fastimport/__init__.py 2020-02-18 05:49:35 +0000 | |||
3365 | @@ -54,8 +54,6 @@ | |||
3366 | 54 | page on Launchpad, https://launchpad.net/bzr-fastimport. | 54 | page on Launchpad, https://launchpad.net/bzr-fastimport. |
3367 | 55 | """ | 55 | """ |
3368 | 56 | 56 | ||
3369 | 57 | from __future__ import absolute_import | ||
3370 | 58 | |||
3371 | 59 | from ... import version_info # noqa: F401 | 57 | from ... import version_info # noqa: F401 |
3372 | 60 | from ...commands import plugin_cmds | 58 | from ...commands import plugin_cmds |
3373 | 61 | 59 | ||
3374 | 62 | 60 | ||
3375 | === modified file 'breezy/plugins/fastimport/branch_mapper.py' | |||
3376 | --- breezy/plugins/fastimport/branch_mapper.py 2018-07-03 23:54:50 +0000 | |||
3377 | +++ breezy/plugins/fastimport/branch_mapper.py 2020-02-18 05:49:35 +0000 | |||
3378 | @@ -16,8 +16,6 @@ | |||
3379 | 16 | """An object that maps git ref names to bzr branch names. Note that it is not | 16 | """An object that maps git ref names to bzr branch names. Note that it is not |
3380 | 17 | used to map git ref names to bzr tag names.""" | 17 | used to map git ref names to bzr tag names.""" |
3381 | 18 | 18 | ||
3382 | 19 | from __future__ import absolute_import | ||
3383 | 20 | |||
3384 | 21 | import re | 19 | import re |
3385 | 22 | 20 | ||
3386 | 23 | 21 | ||
3387 | 24 | 22 | ||
3388 | === modified file 'breezy/plugins/fastimport/branch_updater.py' | |||
3389 | --- breezy/plugins/fastimport/branch_updater.py 2018-11-11 04:08:32 +0000 | |||
3390 | +++ breezy/plugins/fastimport/branch_updater.py 2020-02-18 05:49:35 +0000 | |||
3391 | @@ -15,8 +15,6 @@ | |||
3392 | 15 | 15 | ||
3393 | 16 | """An object that updates a bunch of branches based on data imported.""" | 16 | """An object that updates a bunch of branches based on data imported.""" |
3394 | 17 | 17 | ||
3395 | 18 | from __future__ import absolute_import | ||
3396 | 19 | |||
3397 | 20 | from operator import itemgetter | 18 | from operator import itemgetter |
3398 | 21 | 19 | ||
3399 | 22 | from ... import errors, osutils, transport | 20 | from ... import errors, osutils, transport |
3400 | 23 | 21 | ||
3401 | === modified file 'breezy/plugins/fastimport/bzr_commit_handler.py' | |||
3402 | --- breezy/plugins/fastimport/bzr_commit_handler.py 2019-09-22 13:03:16 +0000 | |||
3403 | +++ breezy/plugins/fastimport/bzr_commit_handler.py 2020-02-18 05:49:35 +0000 | |||
3404 | @@ -15,8 +15,6 @@ | |||
3405 | 15 | 15 | ||
3406 | 16 | """CommitHandlers that build and save revisions & their inventories.""" | 16 | """CommitHandlers that build and save revisions & their inventories.""" |
3407 | 17 | 17 | ||
3408 | 18 | from __future__ import absolute_import | ||
3409 | 19 | |||
3410 | 20 | from ... import ( | 18 | from ... import ( |
3411 | 21 | debug, | 19 | debug, |
3412 | 22 | errors, | 20 | errors, |
3413 | 23 | 21 | ||
3414 | === modified file 'breezy/plugins/fastimport/cache_manager.py' | |||
3415 | --- breezy/plugins/fastimport/cache_manager.py 2018-11-11 04:08:32 +0000 | |||
3416 | +++ breezy/plugins/fastimport/cache_manager.py 2020-02-18 05:49:35 +0000 | |||
3417 | @@ -15,8 +15,6 @@ | |||
3418 | 15 | 15 | ||
3419 | 16 | """A manager of caches.""" | 16 | """A manager of caches.""" |
3420 | 17 | 17 | ||
3421 | 18 | from __future__ import absolute_import | ||
3422 | 19 | |||
3423 | 20 | import atexit | 18 | import atexit |
3424 | 21 | import os | 19 | import os |
3425 | 22 | import shutil | 20 | import shutil |
3426 | 23 | 21 | ||
3427 | === modified file 'breezy/plugins/fastimport/cmds.py' | |||
3428 | --- breezy/plugins/fastimport/cmds.py 2020-02-07 02:14:30 +0000 | |||
3429 | +++ breezy/plugins/fastimport/cmds.py 2020-02-18 05:49:35 +0000 | |||
3430 | @@ -15,8 +15,6 @@ | |||
3431 | 15 | 15 | ||
3432 | 16 | """Fastimport/fastexport commands.""" | 16 | """Fastimport/fastexport commands.""" |
3433 | 17 | 17 | ||
3434 | 18 | from __future__ import absolute_import | ||
3435 | 19 | |||
3436 | 20 | from ... import controldir | 18 | from ... import controldir |
3437 | 21 | from ...commands import Command | 19 | from ...commands import Command |
3438 | 22 | from ...option import Option, RegistryOption | 20 | from ...option import Option, RegistryOption |
3439 | 23 | 21 | ||
3440 | === modified file 'breezy/plugins/fastimport/exporter.py' | |||
3441 | --- breezy/plugins/fastimport/exporter.py 2020-02-07 02:14:30 +0000 | |||
3442 | +++ breezy/plugins/fastimport/exporter.py 2020-02-18 05:49:35 +0000 | |||
3443 | @@ -41,8 +41,6 @@ | |||
3444 | 41 | 41 | ||
3445 | 42 | """Core engine for the fast-export command.""" | 42 | """Core engine for the fast-export command.""" |
3446 | 43 | 43 | ||
3447 | 44 | from __future__ import absolute_import | ||
3448 | 45 | |||
3449 | 46 | # TODO: if a new_git_branch below gets merged repeatedly, the tip of the branch | 44 | # TODO: if a new_git_branch below gets merged repeatedly, the tip of the branch |
3450 | 47 | # is not updated (because the parent of commit is already merged, so we don't | 45 | # is not updated (because the parent of commit is already merged, so we don't |
3451 | 48 | # set new_git_branch to the previously used name) | 46 | # set new_git_branch to the previously used name) |
3452 | 49 | 47 | ||
3453 | === modified file 'breezy/plugins/fastimport/helpers.py' | |||
3454 | --- breezy/plugins/fastimport/helpers.py 2019-03-18 04:31:21 +0000 | |||
3455 | +++ breezy/plugins/fastimport/helpers.py 2020-02-18 05:49:35 +0000 | |||
3456 | @@ -15,8 +15,6 @@ | |||
3457 | 15 | 15 | ||
3458 | 16 | """Miscellaneous useful stuff.""" | 16 | """Miscellaneous useful stuff.""" |
3459 | 17 | 17 | ||
3460 | 18 | from __future__ import absolute_import | ||
3461 | 19 | |||
3462 | 20 | import stat | 18 | import stat |
3463 | 21 | 19 | ||
3464 | 22 | from ... import ( | 20 | from ... import ( |
3465 | 23 | 21 | ||
3466 | === modified file 'breezy/plugins/fastimport/idmapfile.py' | |||
3467 | --- breezy/plugins/fastimport/idmapfile.py 2018-07-03 23:54:50 +0000 | |||
3468 | +++ breezy/plugins/fastimport/idmapfile.py 2020-02-18 05:49:35 +0000 | |||
3469 | @@ -15,8 +15,6 @@ | |||
3470 | 15 | 15 | ||
3471 | 16 | """Routines for saving and loading the id-map file.""" | 16 | """Routines for saving and loading the id-map file.""" |
3472 | 17 | 17 | ||
3473 | 18 | from __future__ import absolute_import | ||
3474 | 19 | |||
3475 | 20 | import os | 18 | import os |
3476 | 21 | 19 | ||
3477 | 22 | 20 | ||
3478 | 23 | 21 | ||
3479 | === modified file 'breezy/plugins/fastimport/marks_file.py' | |||
3480 | --- breezy/plugins/fastimport/marks_file.py 2018-11-11 04:08:32 +0000 | |||
3481 | +++ breezy/plugins/fastimport/marks_file.py 2020-02-18 05:49:35 +0000 | |||
3482 | @@ -15,8 +15,6 @@ | |||
3483 | 15 | 15 | ||
3484 | 16 | """Routines for reading/writing a marks file.""" | 16 | """Routines for reading/writing a marks file.""" |
3485 | 17 | 17 | ||
3486 | 18 | from __future__ import absolute_import | ||
3487 | 19 | |||
3488 | 20 | from ...trace import warning | 18 | from ...trace import warning |
3489 | 21 | 19 | ||
3490 | 22 | 20 | ||
3491 | 23 | 21 | ||
3492 | === modified file 'breezy/plugins/fastimport/processors/__init__.py' | |||
3493 | --- breezy/plugins/fastimport/processors/__init__.py 2017-05-24 14:51:33 +0000 | |||
3494 | +++ breezy/plugins/fastimport/processors/__init__.py 2020-02-18 05:49:35 +0000 | |||
3495 | @@ -14,5 +14,3 @@ | |||
3496 | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
3497 | 15 | 15 | ||
3498 | 16 | """Actual import processors.""" | 16 | """Actual import processors.""" |
3499 | 17 | |||
3500 | 18 | from __future__ import absolute_import | ||
3501 | 19 | 17 | ||
3502 | === modified file 'breezy/plugins/fastimport/processors/generic_processor.py' | |||
3503 | --- breezy/plugins/fastimport/processors/generic_processor.py 2019-12-01 16:21:41 +0000 | |||
3504 | +++ breezy/plugins/fastimport/processors/generic_processor.py 2020-02-18 05:49:35 +0000 | |||
3505 | @@ -15,8 +15,6 @@ | |||
3506 | 15 | 15 | ||
3507 | 16 | """Import processor that supports all Bazaar repository formats.""" | 16 | """Import processor that supports all Bazaar repository formats.""" |
3508 | 17 | 17 | ||
3509 | 18 | from __future__ import absolute_import | ||
3510 | 19 | |||
3511 | 20 | 18 | ||
3512 | 21 | import time | 19 | import time |
3513 | 22 | from .... import ( | 20 | from .... import ( |
3514 | 23 | 21 | ||
3515 | === modified file 'breezy/plugins/fastimport/revision_store.py' | |||
3516 | --- breezy/plugins/fastimport/revision_store.py 2020-01-19 13:47:29 +0000 | |||
3517 | +++ breezy/plugins/fastimport/revision_store.py 2020-02-18 05:49:35 +0000 | |||
3518 | @@ -15,8 +15,6 @@ | |||
3519 | 15 | 15 | ||
3520 | 16 | """An abstraction of a repository providing just the bits importing needs.""" | 16 | """An abstraction of a repository providing just the bits importing needs.""" |
3521 | 17 | 17 | ||
3522 | 18 | from __future__ import absolute_import | ||
3523 | 19 | |||
3524 | 20 | from io import BytesIO | 18 | from io import BytesIO |
3525 | 21 | 19 | ||
3526 | 22 | from ... import ( | 20 | from ... import ( |
3527 | 23 | 21 | ||
3528 | === modified file 'breezy/plugins/fastimport/tests/__init__.py' | |||
3529 | --- breezy/plugins/fastimport/tests/__init__.py 2018-11-11 04:08:32 +0000 | |||
3530 | +++ breezy/plugins/fastimport/tests/__init__.py 2020-02-18 05:49:35 +0000 | |||
3531 | @@ -16,8 +16,6 @@ | |||
3532 | 16 | 16 | ||
3533 | 17 | """Tests for bzr-fastimport.""" | 17 | """Tests for bzr-fastimport.""" |
3534 | 18 | 18 | ||
3535 | 19 | from __future__ import absolute_import | ||
3536 | 20 | |||
3537 | 21 | from .... import errors as bzr_errors | 19 | from .... import errors as bzr_errors |
3538 | 22 | from ....tests import TestLoader | 20 | from ....tests import TestLoader |
3539 | 23 | from ....tests.features import Feature | 21 | from ....tests.features import Feature |
3540 | 24 | 22 | ||
3541 | === modified file 'breezy/plugins/fastimport/tests/test_branch_mapper.py' | |||
3542 | --- breezy/plugins/fastimport/tests/test_branch_mapper.py 2018-11-11 04:08:32 +0000 | |||
3543 | +++ breezy/plugins/fastimport/tests/test_branch_mapper.py 2020-02-18 05:49:35 +0000 | |||
3544 | @@ -15,8 +15,6 @@ | |||
3545 | 15 | 15 | ||
3546 | 16 | """Test the BranchMapper methods.""" | 16 | """Test the BranchMapper methods.""" |
3547 | 17 | 17 | ||
3548 | 18 | from __future__ import absolute_import | ||
3549 | 19 | |||
3550 | 20 | from .... import tests | 18 | from .... import tests |
3551 | 21 | 19 | ||
3552 | 22 | from .. import ( | 20 | from .. import ( |
3553 | 23 | 21 | ||
3554 | === modified file 'breezy/plugins/fastimport/tests/test_commands.py' | |||
3555 | --- breezy/plugins/fastimport/tests/test_commands.py 2019-12-01 16:14:53 +0000 | |||
3556 | +++ breezy/plugins/fastimport/tests/test_commands.py 2020-02-18 05:49:35 +0000 | |||
3557 | @@ -15,8 +15,6 @@ | |||
3558 | 15 | 15 | ||
3559 | 16 | """Test the command implementations.""" | 16 | """Test the command implementations.""" |
3560 | 17 | 17 | ||
3561 | 18 | from __future__ import absolute_import | ||
3562 | 19 | |||
3563 | 20 | import os | 18 | import os |
3564 | 21 | import re | 19 | import re |
3565 | 22 | import tempfile | 20 | import tempfile |
3566 | 23 | 21 | ||
3567 | === modified file 'breezy/plugins/fastimport/tests/test_exporter.py' | |||
3568 | --- breezy/plugins/fastimport/tests/test_exporter.py 2018-11-11 04:08:32 +0000 | |||
3569 | +++ breezy/plugins/fastimport/tests/test_exporter.py 2020-02-18 05:49:35 +0000 | |||
3570 | @@ -15,8 +15,6 @@ | |||
3571 | 15 | 15 | ||
3572 | 16 | """Test the exporter.""" | 16 | """Test the exporter.""" |
3573 | 17 | 17 | ||
3574 | 18 | from __future__ import absolute_import | ||
3575 | 19 | |||
3576 | 20 | import os | 18 | import os |
3577 | 21 | import tempfile | 19 | import tempfile |
3578 | 22 | import gzip | 20 | import gzip |
3579 | 23 | 21 | ||
3580 | === modified file 'breezy/plugins/fastimport/tests/test_generic_processor.py' | |||
3581 | --- breezy/plugins/fastimport/tests/test_generic_processor.py 2019-12-26 13:20:45 +0000 | |||
3582 | +++ breezy/plugins/fastimport/tests/test_generic_processor.py 2020-02-18 05:49:35 +0000 | |||
3583 | @@ -13,8 +13,6 @@ | |||
3584 | 13 | # You should have received a copy of the GNU General Public License | 13 | # You should have received a copy of the GNU General Public License |
3585 | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
3586 | 15 | 15 | ||
3587 | 16 | from __future__ import absolute_import | ||
3588 | 17 | |||
3589 | 18 | import time | 16 | import time |
3590 | 19 | 17 | ||
3591 | 20 | from .... import ( | 18 | from .... import ( |
3592 | 21 | 19 | ||
3593 | === modified file 'breezy/plugins/fastimport/tests/test_head_tracking.py' | |||
3594 | --- breezy/plugins/fastimport/tests/test_head_tracking.py 2020-02-07 02:14:30 +0000 | |||
3595 | +++ breezy/plugins/fastimport/tests/test_head_tracking.py 2020-02-18 05:49:35 +0000 | |||
3596 | @@ -15,8 +15,6 @@ | |||
3597 | 15 | 15 | ||
3598 | 16 | """Test tracking of heads""" | 16 | """Test tracking of heads""" |
3599 | 17 | 17 | ||
3600 | 18 | from __future__ import absolute_import | ||
3601 | 19 | |||
3602 | 20 | from io import StringIO | 18 | from io import StringIO |
3603 | 21 | 19 | ||
3604 | 22 | from fastimport import ( | 20 | from fastimport import ( |
3605 | 23 | 21 | ||
3606 | === modified file 'breezy/plugins/fastimport/tests/test_revision_store.py' | |||
3607 | --- breezy/plugins/fastimport/tests/test_revision_store.py 2019-09-21 23:05:12 +0000 | |||
3608 | +++ breezy/plugins/fastimport/tests/test_revision_store.py 2020-02-18 05:49:35 +0000 | |||
3609 | @@ -15,8 +15,6 @@ | |||
3610 | 15 | 15 | ||
3611 | 16 | """Direct tests of the revision_store classes.""" | 16 | """Direct tests of the revision_store classes.""" |
3612 | 17 | 17 | ||
3613 | 18 | from __future__ import absolute_import | ||
3614 | 19 | |||
3615 | 20 | from .... import ( | 18 | from .... import ( |
3616 | 21 | branch, | 19 | branch, |
3617 | 22 | errors, | 20 | errors, |
3618 | 23 | 21 | ||
3619 | === modified file 'breezy/plugins/fastimport/user_mapper.py' | |||
3620 | --- breezy/plugins/fastimport/user_mapper.py 2020-02-07 02:14:30 +0000 | |||
3621 | +++ breezy/plugins/fastimport/user_mapper.py 2020-02-18 05:49:35 +0000 | |||
3622 | @@ -13,8 +13,6 @@ | |||
3623 | 13 | # You should have received a copy of the GNU General Public License | 13 | # You should have received a copy of the GNU General Public License |
3624 | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
3625 | 15 | 15 | ||
3626 | 16 | from __future__ import absolute_import | ||
3627 | 17 | |||
3628 | 18 | from email.utils import parseaddr | 16 | from email.utils import parseaddr |
3629 | 19 | 17 | ||
3630 | 20 | 18 | ||
3631 | 21 | 19 | ||
3632 | === modified file 'breezy/plugins/flake8/__init__.py' | |||
3633 | --- breezy/plugins/flake8/__init__.py 2019-08-22 21:54:14 +0000 | |||
3634 | +++ breezy/plugins/flake8/__init__.py 2020-02-18 05:49:35 +0000 | |||
3635 | @@ -20,8 +20,6 @@ | |||
3636 | 20 | """ | 20 | """ |
3637 | 21 | 21 | ||
3638 | 22 | 22 | ||
3639 | 23 | from __future__ import absolute_import | ||
3640 | 24 | |||
3641 | 25 | from breezy.errors import BzrError, DependencyNotPresent | 23 | from breezy.errors import BzrError, DependencyNotPresent |
3642 | 26 | 24 | ||
3643 | 27 | 25 | ||
3644 | 28 | 26 | ||
3645 | === modified file 'breezy/plugins/fossil/__init__.py' | |||
3646 | --- breezy/plugins/fossil/__init__.py 2019-11-09 16:27:41 +0000 | |||
3647 | +++ breezy/plugins/fossil/__init__.py 2020-02-18 05:49:35 +0000 | |||
3648 | @@ -19,8 +19,6 @@ | |||
3649 | 19 | Currently only tells the user that Fossil is not supported. | 19 | Currently only tells the user that Fossil is not supported. |
3650 | 20 | """ | 20 | """ |
3651 | 21 | 21 | ||
3652 | 22 | from __future__ import absolute_import | ||
3653 | 23 | |||
3654 | 24 | from ... import version_info # noqa: F401 | 22 | from ... import version_info # noqa: F401 |
3655 | 25 | 23 | ||
3656 | 26 | from ... import ( | 24 | from ... import ( |
3657 | 27 | 25 | ||
3658 | === modified file 'breezy/plugins/hg/__init__.py' | |||
3659 | --- breezy/plugins/hg/__init__.py 2020-01-12 13:56:10 +0000 | |||
3660 | +++ breezy/plugins/hg/__init__.py 2020-02-18 05:49:35 +0000 | |||
3661 | @@ -19,8 +19,6 @@ | |||
3662 | 19 | Currently only tells the user that Mercurial is not supported. | 19 | Currently only tells the user that Mercurial is not supported. |
3663 | 20 | """ | 20 | """ |
3664 | 21 | 21 | ||
3665 | 22 | from __future__ import absolute_import | ||
3666 | 23 | |||
3667 | 24 | from ... import ( | 22 | from ... import ( |
3668 | 25 | controldir, | 23 | controldir, |
3669 | 26 | errors, | 24 | errors, |
3670 | 27 | 25 | ||
3671 | === modified file 'breezy/plugins/launchpad/__init__.py' | |||
3672 | --- breezy/plugins/launchpad/__init__.py 2019-02-14 19:18:27 +0000 | |||
3673 | +++ breezy/plugins/launchpad/__init__.py 2020-02-18 05:49:35 +0000 | |||
3674 | @@ -37,8 +37,6 @@ | |||
3675 | 37 | 37 | ||
3676 | 38 | """ | 38 | """ |
3677 | 39 | 39 | ||
3678 | 40 | from __future__ import absolute_import | ||
3679 | 41 | |||
3680 | 42 | # The XMLRPC server address can be overridden by setting the environment | 40 | # The XMLRPC server address can be overridden by setting the environment |
3681 | 43 | # variable $BRZ_LP_XMLRPC_URL | 41 | # variable $BRZ_LP_XMLRPC_URL |
3682 | 44 | 42 | ||
3683 | 45 | 43 | ||
3684 | === modified file 'breezy/plugins/launchpad/account.py' | |||
3685 | --- breezy/plugins/launchpad/account.py 2018-11-11 04:08:32 +0000 | |||
3686 | +++ breezy/plugins/launchpad/account.py 2020-02-18 05:49:35 +0000 | |||
3687 | @@ -20,8 +20,6 @@ | |||
3688 | 20 | than once for each place that needs to take it into account. | 20 | than once for each place that needs to take it into account. |
3689 | 21 | """ | 21 | """ |
3690 | 22 | 22 | ||
3691 | 23 | from __future__ import absolute_import | ||
3692 | 24 | |||
3693 | 25 | from ... import ( | 23 | from ... import ( |
3694 | 26 | errors, | 24 | errors, |
3695 | 27 | trace, | 25 | trace, |
3696 | 28 | 26 | ||
3697 | === modified file 'breezy/plugins/launchpad/cmds.py' | |||
3698 | --- breezy/plugins/launchpad/cmds.py 2020-02-07 02:14:30 +0000 | |||
3699 | +++ breezy/plugins/launchpad/cmds.py 2020-02-18 05:49:35 +0000 | |||
3700 | @@ -16,8 +16,6 @@ | |||
3701 | 16 | 16 | ||
3702 | 17 | """Launchpad plugin commands.""" | 17 | """Launchpad plugin commands.""" |
3703 | 18 | 18 | ||
3704 | 19 | from __future__ import absolute_import | ||
3705 | 20 | |||
3706 | 21 | from ... import ( | 19 | from ... import ( |
3707 | 22 | branch as _mod_branch, | 20 | branch as _mod_branch, |
3708 | 23 | controldir, | 21 | controldir, |
3709 | 24 | 22 | ||
3710 | === modified file 'breezy/plugins/launchpad/lp_api.py' | |||
3711 | --- breezy/plugins/launchpad/lp_api.py 2020-02-07 02:14:30 +0000 | |||
3712 | +++ breezy/plugins/launchpad/lp_api.py 2020-02-18 05:49:35 +0000 | |||
3713 | @@ -16,8 +16,6 @@ | |||
3714 | 16 | 16 | ||
3715 | 17 | """Tools for dealing with the Launchpad API.""" | 17 | """Tools for dealing with the Launchpad API.""" |
3716 | 18 | 18 | ||
3717 | 19 | from __future__ import absolute_import | ||
3718 | 20 | |||
3719 | 21 | # Importing this module will be expensive, since it imports launchpadlib and | 19 | # Importing this module will be expensive, since it imports launchpadlib and |
3720 | 22 | # its dependencies. However, our plan is to only load this module when it is | 20 | # its dependencies. However, our plan is to only load this module when it is |
3721 | 23 | # needed by a command that uses it. | 21 | # needed by a command that uses it. |
3722 | 24 | 22 | ||
3723 | === modified file 'breezy/plugins/launchpad/lp_directory.py' | |||
3724 | --- breezy/plugins/launchpad/lp_directory.py 2020-02-07 02:14:30 +0000 | |||
3725 | +++ breezy/plugins/launchpad/lp_directory.py 2020-02-18 05:49:35 +0000 | |||
3726 | @@ -16,8 +16,6 @@ | |||
3727 | 16 | 16 | ||
3728 | 17 | """Directory lookup that uses Launchpad.""" | 17 | """Directory lookup that uses Launchpad.""" |
3729 | 18 | 18 | ||
3730 | 19 | from __future__ import absolute_import | ||
3731 | 20 | |||
3732 | 21 | from urllib.parse import urlsplit | 19 | from urllib.parse import urlsplit |
3733 | 22 | from xmlrpc.client import Fault | 20 | from xmlrpc.client import Fault |
3734 | 23 | 21 | ||
3735 | 24 | 22 | ||
3736 | === modified file 'breezy/plugins/launchpad/lp_propose.py' | |||
3737 | --- breezy/plugins/launchpad/lp_propose.py 2019-06-15 12:04:34 +0000 | |||
3738 | +++ breezy/plugins/launchpad/lp_propose.py 2020-02-18 05:49:35 +0000 | |||
3739 | @@ -14,8 +14,6 @@ | |||
3740 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3741 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3742 | 16 | 16 | ||
3743 | 17 | from __future__ import absolute_import | ||
3744 | 18 | |||
3745 | 19 | from ... import ( | 17 | from ... import ( |
3746 | 20 | errors, | 18 | errors, |
3747 | 21 | hooks, | 19 | hooks, |
3748 | 22 | 20 | ||
3749 | === modified file 'breezy/plugins/launchpad/lp_registration.py' | |||
3750 | --- breezy/plugins/launchpad/lp_registration.py 2020-02-07 02:14:30 +0000 | |||
3751 | +++ breezy/plugins/launchpad/lp_registration.py 2020-02-18 05:49:35 +0000 | |||
3752 | @@ -14,8 +14,6 @@ | |||
3753 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3754 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3755 | 16 | 16 | ||
3756 | 17 | from __future__ import absolute_import | ||
3757 | 18 | |||
3758 | 19 | from io import BytesIO | 17 | from io import BytesIO |
3759 | 20 | import os | 18 | import os |
3760 | 21 | import socket | 19 | import socket |
3761 | 22 | 20 | ||
3762 | === modified file 'breezy/plugins/launchpad/uris.py' | |||
3763 | --- breezy/plugins/launchpad/uris.py 2019-10-27 00:30:00 +0000 | |||
3764 | +++ breezy/plugins/launchpad/uris.py 2020-02-18 05:49:35 +0000 | |||
3765 | @@ -16,8 +16,6 @@ | |||
3766 | 16 | 16 | ||
3767 | 17 | """Launchpad URIs.""" | 17 | """Launchpad URIs.""" |
3768 | 18 | 18 | ||
3769 | 19 | from __future__ import absolute_import | ||
3770 | 20 | |||
3771 | 21 | 19 | ||
3772 | 22 | # We use production as the default because edge has been deprecated circa | 20 | # We use production as the default because edge has been deprecated circa |
3773 | 23 | # 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667) | 21 | # 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667) |
3774 | 24 | 22 | ||
3775 | === modified file 'breezy/plugins/mtn/__init__.py' | |||
3776 | --- breezy/plugins/mtn/__init__.py 2019-11-06 01:31:41 +0000 | |||
3777 | +++ breezy/plugins/mtn/__init__.py 2020-02-18 05:49:35 +0000 | |||
3778 | @@ -19,8 +19,6 @@ | |||
3779 | 19 | Currently only tells the user that Monotone is not supported. | 19 | Currently only tells the user that Monotone is not supported. |
3780 | 20 | """ | 20 | """ |
3781 | 21 | 21 | ||
3782 | 22 | from __future__ import absolute_import | ||
3783 | 23 | |||
3784 | 24 | from ... import version_info # noqa: F401 | 22 | from ... import version_info # noqa: F401 |
3785 | 25 | 23 | ||
3786 | 26 | from ... import ( | 24 | from ... import ( |
3787 | 27 | 25 | ||
3788 | === modified file 'breezy/plugins/netrc_credential_store/__init__.py' | |||
3789 | --- breezy/plugins/netrc_credential_store/__init__.py 2020-01-11 17:41:33 +0000 | |||
3790 | +++ breezy/plugins/netrc_credential_store/__init__.py 2020-02-18 05:49:35 +0000 | |||
3791 | @@ -14,8 +14,6 @@ | |||
3792 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3793 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3794 | 16 | 16 | ||
3795 | 17 | from __future__ import absolute_import | ||
3796 | 18 | |||
3797 | 19 | __doc__ = """Use ~/.netrc as a credential store for authentication.conf.""" | 17 | __doc__ = """Use ~/.netrc as a credential store for authentication.conf.""" |
3798 | 20 | 18 | ||
3799 | 21 | # Since we are a built-in plugin we share the breezy version | 19 | # Since we are a built-in plugin we share the breezy version |
3800 | 22 | 20 | ||
3801 | === modified file 'breezy/plugins/news_merge/__init__.py' | |||
3802 | --- breezy/plugins/news_merge/__init__.py 2018-11-11 04:08:32 +0000 | |||
3803 | +++ breezy/plugins/news_merge/__init__.py 2020-02-18 05:49:35 +0000 | |||
3804 | @@ -14,8 +14,6 @@ | |||
3805 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3806 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3807 | 16 | 16 | ||
3808 | 17 | from __future__ import absolute_import | ||
3809 | 18 | |||
3810 | 19 | __doc__ = """Merge hook for bzr's NEWS file. | 17 | __doc__ = """Merge hook for bzr's NEWS file. |
3811 | 20 | 18 | ||
3812 | 21 | To enable this plugin, add a section to your branch.conf or location.conf | 19 | To enable this plugin, add a section to your branch.conf or location.conf |
3813 | 22 | 20 | ||
3814 | === modified file 'breezy/plugins/news_merge/news_merge.py' | |||
3815 | --- breezy/plugins/news_merge/news_merge.py 2018-11-11 04:08:32 +0000 | |||
3816 | +++ breezy/plugins/news_merge/news_merge.py 2020-02-18 05:49:35 +0000 | |||
3817 | @@ -16,9 +16,6 @@ | |||
3818 | 16 | 16 | ||
3819 | 17 | """Merge logic for news_merge plugin.""" | 17 | """Merge logic for news_merge plugin.""" |
3820 | 18 | 18 | ||
3821 | 19 | from __future__ import absolute_import | ||
3822 | 20 | |||
3823 | 21 | |||
3824 | 22 | from .parser import simple_parse_lines | 19 | from .parser import simple_parse_lines |
3825 | 23 | from ... import merge, merge3 | 20 | from ... import merge, merge3 |
3826 | 24 | 21 | ||
3827 | 25 | 22 | ||
3828 | === modified file 'breezy/plugins/news_merge/parser.py' | |||
3829 | --- breezy/plugins/news_merge/parser.py 2018-11-11 04:08:32 +0000 | |||
3830 | +++ breezy/plugins/news_merge/parser.py 2020-02-18 05:49:35 +0000 | |||
3831 | @@ -24,9 +24,6 @@ | |||
3832 | 24 | simple_parse's docstring). | 24 | simple_parse's docstring). |
3833 | 25 | """ | 25 | """ |
3834 | 26 | 26 | ||
3835 | 27 | from __future__ import absolute_import | ||
3836 | 28 | |||
3837 | 29 | |||
3838 | 30 | def simple_parse_lines(lines): | 27 | def simple_parse_lines(lines): |
3839 | 31 | """Same as simple_parse, but takes an iterable of strs rather than a single | 28 | """Same as simple_parse, but takes an iterable of strs rather than a single |
3840 | 32 | str. | 29 | str. |
3841 | 33 | 30 | ||
3842 | === modified file 'breezy/plugins/po_merge/__init__.py' | |||
3843 | --- breezy/plugins/po_merge/__init__.py 2018-11-11 04:08:32 +0000 | |||
3844 | +++ breezy/plugins/po_merge/__init__.py 2020-02-18 05:49:35 +0000 | |||
3845 | @@ -14,8 +14,6 @@ | |||
3846 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
3847 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
3848 | 16 | 16 | ||
3849 | 17 | from __future__ import absolute_import | ||
3850 | 18 | |||
3851 | 19 | __doc__ = """Merge hook for ``.po`` files. | 17 | __doc__ = """Merge hook for ``.po`` files. |
3852 | 20 | 18 | ||
3853 | 21 | To enable this plugin, add a section to your branch.conf or location.conf | 19 | To enable this plugin, add a section to your branch.conf or location.conf |
3854 | 22 | 20 | ||
3855 | === modified file 'breezy/plugins/po_merge/po_merge.py' | |||
3856 | --- breezy/plugins/po_merge/po_merge.py 2018-11-21 03:20:30 +0000 | |||
3857 | +++ breezy/plugins/po_merge/po_merge.py 2020-02-18 05:49:35 +0000 | |||
3858 | @@ -16,8 +16,6 @@ | |||
3859 | 16 | 16 | ||
3860 | 17 | """Merge logic for po_merge plugin.""" | 17 | """Merge logic for po_merge plugin.""" |
3861 | 18 | 18 | ||
3862 | 19 | from __future__ import absolute_import | ||
3863 | 20 | |||
3864 | 21 | from ... import ( | 19 | from ... import ( |
3865 | 22 | config, | 20 | config, |
3866 | 23 | merge, | 21 | merge, |
3867 | 24 | 22 | ||
3868 | === modified file 'breezy/plugins/propose/__init__.py' | |||
3869 | --- breezy/plugins/propose/__init__.py 2019-10-27 13:45:49 +0000 | |||
3870 | +++ breezy/plugins/propose/__init__.py 2020-02-18 05:49:35 +0000 | |||
3871 | @@ -16,8 +16,6 @@ | |||
3872 | 16 | 16 | ||
3873 | 17 | """Management of hosted branches.""" | 17 | """Management of hosted branches.""" |
3874 | 18 | 18 | ||
3875 | 19 | from __future__ import absolute_import | ||
3876 | 20 | |||
3877 | 21 | from ... import version_info # noqa: F401 | 19 | from ... import version_info # noqa: F401 |
3878 | 22 | from ...commands import plugin_cmds | 20 | from ...commands import plugin_cmds |
3879 | 23 | 21 | ||
3880 | 24 | 22 | ||
3881 | === modified file 'breezy/plugins/propose/cmds.py' | |||
3882 | --- breezy/plugins/propose/cmds.py 2020-02-07 02:14:30 +0000 | |||
3883 | +++ breezy/plugins/propose/cmds.py 2020-02-18 05:49:35 +0000 | |||
3884 | @@ -16,8 +16,6 @@ | |||
3885 | 16 | 16 | ||
3886 | 17 | """Propose command implementations.""" | 17 | """Propose command implementations.""" |
3887 | 18 | 18 | ||
3888 | 19 | from __future__ import absolute_import | ||
3889 | 20 | |||
3890 | 21 | from io import StringIO | 19 | from io import StringIO |
3891 | 22 | 20 | ||
3892 | 23 | from ... import ( | 21 | from ... import ( |
3893 | 24 | 22 | ||
3894 | === modified file 'breezy/plugins/propose/github.py' | |||
3895 | --- breezy/plugins/propose/github.py 2020-02-07 02:14:30 +0000 | |||
3896 | +++ breezy/plugins/propose/github.py 2020-02-18 05:49:35 +0000 | |||
3897 | @@ -16,8 +16,6 @@ | |||
3898 | 16 | 16 | ||
3899 | 17 | """Support for GitHub.""" | 17 | """Support for GitHub.""" |
3900 | 18 | 18 | ||
3901 | 19 | from __future__ import absolute_import | ||
3902 | 20 | |||
3903 | 21 | import json | 19 | import json |
3904 | 22 | import os | 20 | import os |
3905 | 23 | 21 | ||
3906 | 24 | 22 | ||
3907 | === modified file 'breezy/plugins/propose/gitlabs.py' | |||
3908 | --- breezy/plugins/propose/gitlabs.py 2020-02-07 02:14:30 +0000 | |||
3909 | +++ breezy/plugins/propose/gitlabs.py 2020-02-18 05:49:35 +0000 | |||
3910 | @@ -16,8 +16,6 @@ | |||
3911 | 16 | 16 | ||
3912 | 17 | """Support for GitLab.""" | 17 | """Support for GitLab.""" |
3913 | 18 | 18 | ||
3914 | 19 | from __future__ import absolute_import | ||
3915 | 20 | |||
3916 | 21 | import json | 19 | import json |
3917 | 22 | import os | 20 | import os |
3918 | 23 | import time | 21 | import time |
3919 | 24 | 22 | ||
3920 | === modified file 'breezy/plugins/propose/launchpad.py' | |||
3921 | --- breezy/plugins/propose/launchpad.py 2020-01-28 23:33:16 +0000 | |||
3922 | +++ breezy/plugins/propose/launchpad.py 2020-02-18 05:49:35 +0000 | |||
3923 | @@ -17,8 +17,6 @@ | |||
3924 | 17 | 17 | ||
3925 | 18 | """Support for Launchpad.""" | 18 | """Support for Launchpad.""" |
3926 | 19 | 19 | ||
3927 | 20 | from __future__ import absolute_import | ||
3928 | 21 | |||
3929 | 22 | import re | 20 | import re |
3930 | 23 | import shutil | 21 | import shutil |
3931 | 24 | import tempfile | 22 | import tempfile |
3932 | 25 | 23 | ||
3933 | === modified file 'breezy/plugins/quilt/__init__.py' | |||
3934 | --- breezy/plugins/quilt/__init__.py 2019-06-15 11:47:16 +0000 | |||
3935 | +++ breezy/plugins/quilt/__init__.py 2020-02-18 05:49:35 +0000 | |||
3936 | @@ -15,8 +15,6 @@ | |||
3937 | 15 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
3938 | 16 | # | 16 | # |
3939 | 17 | 17 | ||
3940 | 18 | from __future__ import absolute_import | ||
3941 | 19 | |||
3942 | 20 | """Quilt patch integration. | 18 | """Quilt patch integration. |
3943 | 21 | 19 | ||
3944 | 22 | This plugin adds support for three configuration options: | 20 | This plugin adds support for three configuration options: |
3945 | 23 | 21 | ||
3946 | === modified file 'breezy/plugins/quilt/merge.py' | |||
3947 | --- breezy/plugins/quilt/merge.py 2019-06-15 11:47:16 +0000 | |||
3948 | +++ breezy/plugins/quilt/merge.py 2020-02-18 05:49:35 +0000 | |||
3949 | @@ -19,8 +19,6 @@ | |||
3950 | 19 | 19 | ||
3951 | 20 | """Quilt patch handling.""" | 20 | """Quilt patch handling.""" |
3952 | 21 | 21 | ||
3953 | 22 | from __future__ import absolute_import | ||
3954 | 23 | |||
3955 | 24 | import shutil | 22 | import shutil |
3956 | 25 | import tempfile | 23 | import tempfile |
3957 | 26 | 24 | ||
3958 | 27 | 25 | ||
3959 | === modified file 'breezy/plugins/quilt/quilt.py' | |||
3960 | --- breezy/plugins/quilt/quilt.py 2019-08-31 10:25:20 +0000 | |||
3961 | +++ breezy/plugins/quilt/quilt.py 2020-02-18 05:49:35 +0000 | |||
3962 | @@ -18,8 +18,6 @@ | |||
3963 | 18 | 18 | ||
3964 | 19 | """Quilt patch handling.""" | 19 | """Quilt patch handling.""" |
3965 | 20 | 20 | ||
3966 | 21 | from __future__ import absolute_import | ||
3967 | 22 | |||
3968 | 23 | import os | 21 | import os |
3969 | 24 | 22 | ||
3970 | 25 | from ... import osutils | 23 | from ... import osutils |
3971 | 26 | 24 | ||
3972 | === modified file 'breezy/plugins/quilt/tests/__init__.py' | |||
3973 | --- breezy/plugins/quilt/tests/__init__.py 2019-06-15 11:47:16 +0000 | |||
3974 | +++ breezy/plugins/quilt/tests/__init__.py 2020-02-18 05:49:35 +0000 | |||
3975 | @@ -16,8 +16,6 @@ | |||
3976 | 16 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 16 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
3977 | 17 | # | 17 | # |
3978 | 18 | 18 | ||
3979 | 19 | from __future__ import absolute_import | ||
3980 | 20 | |||
3981 | 21 | from .... import tests | 19 | from .... import tests |
3982 | 22 | 20 | ||
3983 | 23 | from ....tests import ( | 21 | from ....tests import ( |
3984 | 24 | 22 | ||
3985 | === modified file 'breezy/plugins/quilt/tests/test_merge.py' | |||
3986 | --- breezy/plugins/quilt/tests/test_merge.py 2019-06-16 13:10:54 +0000 | |||
3987 | +++ breezy/plugins/quilt/tests/test_merge.py 2020-02-18 05:49:35 +0000 | |||
3988 | @@ -18,8 +18,6 @@ | |||
3989 | 18 | 18 | ||
3990 | 19 | """Tests for the merge_quilt code.""" | 19 | """Tests for the merge_quilt code.""" |
3991 | 20 | 20 | ||
3992 | 21 | from __future__ import absolute_import | ||
3993 | 22 | |||
3994 | 23 | import os | 21 | import os |
3995 | 24 | import shutil | 22 | import shutil |
3996 | 25 | 23 | ||
3997 | 26 | 24 | ||
3998 | === modified file 'breezy/plugins/quilt/tests/test_wrapper.py' | |||
3999 | --- breezy/plugins/quilt/tests/test_wrapper.py 2019-11-18 04:21:00 +0000 | |||
4000 | +++ breezy/plugins/quilt/tests/test_wrapper.py 2020-02-18 05:49:35 +0000 | |||
4001 | @@ -18,8 +18,6 @@ | |||
4002 | 18 | 18 | ||
4003 | 19 | """Tests for the quilt code.""" | 19 | """Tests for the quilt code.""" |
4004 | 20 | 20 | ||
4005 | 21 | from __future__ import absolute_import | ||
4006 | 22 | |||
4007 | 23 | import os | 21 | import os |
4008 | 24 | 22 | ||
4009 | 25 | from ..wrapper import ( | 23 | from ..wrapper import ( |
4010 | 26 | 24 | ||
4011 | === modified file 'breezy/plugins/quilt/wrapper.py' | |||
4012 | --- breezy/plugins/quilt/wrapper.py 2019-11-18 04:21:00 +0000 | |||
4013 | +++ breezy/plugins/quilt/wrapper.py 2020-02-18 05:49:35 +0000 | |||
4014 | @@ -19,8 +19,6 @@ | |||
4015 | 19 | 19 | ||
4016 | 20 | """Quilt patch handling.""" | 20 | """Quilt patch handling.""" |
4017 | 21 | 21 | ||
4018 | 22 | from __future__ import absolute_import | ||
4019 | 23 | |||
4020 | 24 | import errno | 22 | import errno |
4021 | 25 | import os | 23 | import os |
4022 | 26 | import signal | 24 | import signal |
4023 | 27 | 25 | ||
4024 | === modified file 'breezy/plugins/repodebug/__init__.py' | |||
4025 | --- breezy/plugins/repodebug/__init__.py 2019-10-13 16:49:05 +0000 | |||
4026 | +++ breezy/plugins/repodebug/__init__.py 2020-02-18 05:49:35 +0000 | |||
4027 | @@ -20,8 +20,6 @@ | |||
4028 | 20 | as hidden commands. | 20 | as hidden commands. |
4029 | 21 | """ | 21 | """ |
4030 | 22 | 22 | ||
4031 | 23 | from __future__ import absolute_import | ||
4032 | 24 | |||
4033 | 25 | from ... import version_info # noqa: F401 | 23 | from ... import version_info # noqa: F401 |
4034 | 26 | from ...commands import plugin_cmds | 24 | from ...commands import plugin_cmds |
4035 | 27 | 25 | ||
4036 | 28 | 26 | ||
4037 | === modified file 'breezy/plugins/repodebug/check_chk.py' | |||
4038 | --- breezy/plugins/repodebug/check_chk.py 2018-11-07 21:17:53 +0000 | |||
4039 | +++ breezy/plugins/repodebug/check_chk.py 2020-02-18 05:49:35 +0000 | |||
4040 | @@ -18,8 +18,6 @@ | |||
4041 | 18 | 18 | ||
4042 | 19 | """ | 19 | """ |
4043 | 20 | 20 | ||
4044 | 21 | from __future__ import absolute_import | ||
4045 | 22 | |||
4046 | 23 | from ... import ( | 21 | from ... import ( |
4047 | 24 | controldir, | 22 | controldir, |
4048 | 25 | commands, | 23 | commands, |
4049 | 26 | 24 | ||
4050 | === modified file 'breezy/plugins/repodebug/chk_used_by.py' | |||
4051 | --- breezy/plugins/repodebug/chk_used_by.py 2018-11-11 04:08:32 +0000 | |||
4052 | +++ breezy/plugins/repodebug/chk_used_by.py 2020-02-18 05:49:35 +0000 | |||
4053 | @@ -14,8 +14,6 @@ | |||
4054 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4055 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4056 | 16 | 16 | ||
4057 | 17 | from __future__ import absolute_import | ||
4058 | 18 | |||
4059 | 19 | from ... import ( | 17 | from ... import ( |
4060 | 20 | controldir, | 18 | controldir, |
4061 | 21 | static_tuple, | 19 | static_tuple, |
4062 | 22 | 20 | ||
4063 | === modified file 'breezy/plugins/repodebug/fetch_all_records.py' | |||
4064 | --- breezy/plugins/repodebug/fetch_all_records.py 2018-11-11 04:08:32 +0000 | |||
4065 | +++ breezy/plugins/repodebug/fetch_all_records.py 2020-02-18 05:49:35 +0000 | |||
4066 | @@ -14,8 +14,6 @@ | |||
4067 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4068 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4069 | 16 | 16 | ||
4070 | 17 | from __future__ import absolute_import | ||
4071 | 18 | from __future__ import print_function | ||
4072 | 19 | 17 | ||
4073 | 20 | from ...controldir import ControlDir | 18 | from ...controldir import ControlDir |
4074 | 21 | from ...commands import Command, Option | 19 | from ...commands import Command, Option |
4075 | 22 | 20 | ||
4076 | === modified file 'breezy/plugins/repodebug/file_refs.py' | |||
4077 | --- breezy/plugins/repodebug/file_refs.py 2018-05-27 18:00:21 +0000 | |||
4078 | +++ breezy/plugins/repodebug/file_refs.py 2020-02-18 05:49:35 +0000 | |||
4079 | @@ -14,8 +14,6 @@ | |||
4080 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4081 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4082 | 16 | 16 | ||
4083 | 17 | from __future__ import absolute_import | ||
4084 | 18 | |||
4085 | 19 | from ... import ( | 17 | from ... import ( |
4086 | 20 | controldir, | 18 | controldir, |
4087 | 21 | commands, | 19 | commands, |
4088 | 22 | 20 | ||
4089 | === modified file 'breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py' | |||
4090 | --- breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py 2020-02-07 02:14:30 +0000 | |||
4091 | +++ breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py 2020-02-18 05:49:35 +0000 | |||
4092 | @@ -14,8 +14,6 @@ | |||
4093 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4094 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4095 | 16 | 16 | ||
4096 | 17 | from __future__ import absolute_import | ||
4097 | 18 | |||
4098 | 19 | from ...controldir import ControlDir | 17 | from ...controldir import ControlDir |
4099 | 20 | from ...commands import Command, Option | 18 | from ...commands import Command, Option |
4100 | 21 | from ... import errors | 19 | from ... import errors |
4101 | 22 | 20 | ||
4102 | === modified file 'breezy/plugins/repodebug/repo_has_key.py' | |||
4103 | --- breezy/plugins/repodebug/repo_has_key.py 2017-09-07 08:21:29 +0000 | |||
4104 | +++ breezy/plugins/repodebug/repo_has_key.py 2020-02-18 05:49:35 +0000 | |||
4105 | @@ -14,8 +14,6 @@ | |||
4106 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4107 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4108 | 16 | 16 | ||
4109 | 17 | from __future__ import absolute_import | ||
4110 | 18 | |||
4111 | 19 | from ...controldir import ControlDir | 17 | from ...controldir import ControlDir |
4112 | 20 | from ...commands import Command | 18 | from ...commands import Command |
4113 | 21 | 19 | ||
4114 | 22 | 20 | ||
4115 | === modified file 'breezy/plugins/repodebug/repo_keys.py' | |||
4116 | --- breezy/plugins/repodebug/repo_keys.py 2018-11-11 04:08:32 +0000 | |||
4117 | +++ breezy/plugins/repodebug/repo_keys.py 2020-02-18 05:49:35 +0000 | |||
4118 | @@ -14,8 +14,6 @@ | |||
4119 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4120 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4121 | 16 | 16 | ||
4122 | 17 | from __future__ import absolute_import | ||
4123 | 18 | |||
4124 | 19 | from ... import controldir | 17 | from ... import controldir |
4125 | 20 | from ...commands import Command | 18 | from ...commands import Command |
4126 | 21 | 19 | ||
4127 | 22 | 20 | ||
4128 | === modified file 'breezy/plugins/rewrite/__init__.py' | |||
4129 | --- breezy/plugins/rewrite/__init__.py 2020-01-11 17:20:34 +0000 | |||
4130 | +++ breezy/plugins/rewrite/__init__.py 2020-02-18 05:49:35 +0000 | |||
4131 | @@ -21,8 +21,6 @@ | |||
4132 | 21 | 'rebase-continue' command or abort using the 'rebase-abort' command. | 21 | 'rebase-continue' command or abort using the 'rebase-abort' command. |
4133 | 22 | """ | 22 | """ |
4134 | 23 | 23 | ||
4135 | 24 | from __future__ import absolute_import | ||
4136 | 25 | |||
4137 | 26 | from ... import errors | 24 | from ... import errors |
4138 | 27 | from ...commands import plugin_cmds | 25 | from ...commands import plugin_cmds |
4139 | 28 | 26 | ||
4140 | 29 | 27 | ||
4141 | === modified file 'breezy/plugins/rewrite/commands.py' | |||
4142 | --- breezy/plugins/rewrite/commands.py 2020-01-11 17:20:34 +0000 | |||
4143 | +++ breezy/plugins/rewrite/commands.py 2020-02-18 05:49:35 +0000 | |||
4144 | @@ -16,8 +16,6 @@ | |||
4145 | 16 | 16 | ||
4146 | 17 | """Bazaar command-line subcommands.""" | 17 | """Bazaar command-line subcommands.""" |
4147 | 18 | 18 | ||
4148 | 19 | from __future__ import absolute_import | ||
4149 | 20 | |||
4150 | 21 | from ...commands import ( | 19 | from ...commands import ( |
4151 | 22 | Command, | 20 | Command, |
4152 | 23 | display_command, | 21 | display_command, |
4153 | 24 | 22 | ||
4154 | === modified file 'breezy/plugins/rewrite/maptree.py' | |||
4155 | --- breezy/plugins/rewrite/maptree.py 2020-01-19 13:47:29 +0000 | |||
4156 | +++ breezy/plugins/rewrite/maptree.py 2020-02-18 05:49:35 +0000 | |||
4157 | @@ -15,8 +15,6 @@ | |||
4158 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
4159 | 16 | """Map Tree.""" | 16 | """Map Tree.""" |
4160 | 17 | 17 | ||
4161 | 18 | from __future__ import absolute_import | ||
4162 | 19 | |||
4163 | 20 | def map_file_ids(repository, old_parents, new_parents): | 18 | def map_file_ids(repository, old_parents, new_parents): |
4164 | 21 | """Try to determine the equivalent file ids in two sets of parents. | 19 | """Try to determine the equivalent file ids in two sets of parents. |
4165 | 22 | 20 | ||
4166 | 23 | 21 | ||
4167 | === modified file 'breezy/plugins/rewrite/pseudonyms.py' | |||
4168 | --- breezy/plugins/rewrite/pseudonyms.py 2020-01-11 17:20:34 +0000 | |||
4169 | +++ breezy/plugins/rewrite/pseudonyms.py 2020-02-18 05:49:35 +0000 | |||
4170 | @@ -16,8 +16,6 @@ | |||
4171 | 16 | 16 | ||
4172 | 17 | """Revision pseudonyms.""" | 17 | """Revision pseudonyms.""" |
4173 | 18 | 18 | ||
4174 | 19 | from __future__ import absolute_import | ||
4175 | 20 | |||
4176 | 21 | from collections import defaultdict | 19 | from collections import defaultdict |
4177 | 22 | 20 | ||
4178 | 23 | from breezy import ( | 21 | from breezy import ( |
4179 | 24 | 22 | ||
4180 | === modified file 'breezy/plugins/rewrite/rebase.py' | |||
4181 | --- breezy/plugins/rewrite/rebase.py 2020-01-11 23:46:34 +0000 | |||
4182 | +++ breezy/plugins/rewrite/rebase.py 2020-02-18 05:49:35 +0000 | |||
4183 | @@ -16,8 +16,6 @@ | |||
4184 | 16 | 16 | ||
4185 | 17 | """Rebase.""" | 17 | """Rebase.""" |
4186 | 18 | 18 | ||
4187 | 19 | from __future__ import absolute_import | ||
4188 | 20 | |||
4189 | 21 | import os | 19 | import os |
4190 | 22 | 20 | ||
4191 | 23 | from ... import ( | 21 | from ... import ( |
4192 | 24 | 22 | ||
4193 | === modified file 'breezy/plugins/rewrite/upgrade.py' | |||
4194 | --- breezy/plugins/rewrite/upgrade.py 2020-01-11 17:20:34 +0000 | |||
4195 | +++ breezy/plugins/rewrite/upgrade.py 2020-02-18 05:49:35 +0000 | |||
4196 | @@ -17,8 +17,6 @@ | |||
4197 | 17 | 17 | ||
4198 | 18 | """Upgrading revisions made with older versions of the mapping.""" | 18 | """Upgrading revisions made with older versions of the mapping.""" |
4199 | 19 | 19 | ||
4200 | 20 | from __future__ import absolute_import | ||
4201 | 21 | |||
4202 | 22 | from ... import ( | 20 | from ... import ( |
4203 | 23 | osutils, | 21 | osutils, |
4204 | 24 | trace, | 22 | trace, |
4205 | 25 | 23 | ||
4206 | === modified file 'breezy/plugins/stats/__init__.py' | |||
4207 | --- breezy/plugins/stats/__init__.py 2019-11-28 08:57:20 +0000 | |||
4208 | +++ breezy/plugins/stats/__init__.py 2020-02-18 05:49:35 +0000 | |||
4209 | @@ -15,8 +15,6 @@ | |||
4210 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
4211 | 16 | """A Simple bzr plugin to generate statistics about the history.""" | 16 | """A Simple bzr plugin to generate statistics about the history.""" |
4212 | 17 | 17 | ||
4213 | 18 | from __future__ import absolute_import | ||
4214 | 19 | |||
4215 | 20 | from ... import _format_version_tuple, version_info | 18 | from ... import _format_version_tuple, version_info |
4216 | 21 | 19 | ||
4217 | 22 | __version__ = _format_version_tuple(version_info) | 20 | __version__ = _format_version_tuple(version_info) |
4218 | 23 | 21 | ||
4219 | === modified file 'breezy/plugins/stats/classify.py' | |||
4220 | --- breezy/plugins/stats/classify.py 2019-11-28 08:57:20 +0000 | |||
4221 | +++ breezy/plugins/stats/classify.py 2020-02-18 05:49:35 +0000 | |||
4222 | @@ -15,8 +15,6 @@ | |||
4223 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
4224 | 16 | """Classify a commit based on the types of files it changed.""" | 16 | """Classify a commit based on the types of files it changed.""" |
4225 | 17 | 17 | ||
4226 | 18 | from __future__ import absolute_import | ||
4227 | 19 | |||
4228 | 20 | import os.path | 18 | import os.path |
4229 | 21 | 19 | ||
4230 | 22 | from ... import urlutils | 20 | from ... import urlutils |
4231 | 23 | 21 | ||
4232 | === modified file 'breezy/plugins/stats/cmds.py' | |||
4233 | --- breezy/plugins/stats/cmds.py 2019-12-23 00:34:25 +0000 | |||
4234 | +++ breezy/plugins/stats/cmds.py 2020-02-18 05:49:35 +0000 | |||
4235 | @@ -15,8 +15,6 @@ | |||
4236 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
4237 | 16 | """A Simple bzr plugin to generate statistics about the history.""" | 16 | """A Simple bzr plugin to generate statistics about the history.""" |
4238 | 17 | 17 | ||
4239 | 18 | from __future__ import absolute_import | ||
4240 | 19 | |||
4241 | 20 | import operator | 18 | import operator |
4242 | 21 | 19 | ||
4243 | 22 | from ... import ( | 20 | from ... import ( |
4244 | 23 | 21 | ||
4245 | === modified file 'breezy/plugins/stats/test_blackbox.py' | |||
4246 | --- breezy/plugins/stats/test_blackbox.py 2019-11-28 08:57:20 +0000 | |||
4247 | +++ breezy/plugins/stats/test_blackbox.py 2020-02-18 05:49:35 +0000 | |||
4248 | @@ -1,5 +1,3 @@ | |||
4249 | 1 | from __future__ import absolute_import | ||
4250 | 2 | |||
4251 | 3 | from ...tests import TestCaseWithTransport | 1 | from ...tests import TestCaseWithTransport |
4252 | 4 | 2 | ||
4253 | 5 | 3 | ||
4254 | 6 | 4 | ||
4255 | === modified file 'breezy/plugins/stats/test_classify.py' | |||
4256 | --- breezy/plugins/stats/test_classify.py 2017-06-01 23:52:12 +0000 | |||
4257 | +++ breezy/plugins/stats/test_classify.py 2020-02-18 05:49:35 +0000 | |||
4258 | @@ -14,8 +14,6 @@ | |||
4259 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4260 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
4261 | 16 | 16 | ||
4262 | 17 | from __future__ import absolute_import | ||
4263 | 18 | |||
4264 | 19 | from ...tests import TestCase | 17 | from ...tests import TestCase |
4265 | 20 | from .classify import classify_filename | 18 | from .classify import classify_filename |
4266 | 21 | 19 | ||
4267 | 22 | 20 | ||
4268 | === modified file 'breezy/plugins/stats/test_stats.py' | |||
4269 | --- breezy/plugins/stats/test_stats.py 2018-11-11 04:08:32 +0000 | |||
4270 | +++ breezy/plugins/stats/test_stats.py 2020-02-18 05:49:35 +0000 | |||
4271 | @@ -1,5 +1,3 @@ | |||
4272 | 1 | from __future__ import absolute_import | ||
4273 | 2 | |||
4274 | 3 | from ...tests import TestCase, TestCaseWithTransport | 1 | from ...tests import TestCase, TestCaseWithTransport |
4275 | 4 | from ...revision import Revision | 2 | from ...revision import Revision |
4276 | 5 | from .cmds import get_revisions_and_committers, collapse_by_person | 3 | from .cmds import get_revisions_and_committers, collapse_by_person |
4277 | 6 | 4 | ||
4278 | === modified file 'breezy/plugins/svn/__init__.py' | |||
4279 | --- breezy/plugins/svn/__init__.py 2020-01-13 00:27:14 +0000 | |||
4280 | +++ breezy/plugins/svn/__init__.py 2020-02-18 05:49:35 +0000 | |||
4281 | @@ -19,8 +19,6 @@ | |||
4282 | 19 | Currently only tells the user that Subversion is not supported. | 19 | Currently only tells the user that Subversion is not supported. |
4283 | 20 | """ | 20 | """ |
4284 | 21 | 21 | ||
4285 | 22 | from __future__ import absolute_import | ||
4286 | 23 | |||
4287 | 24 | from ... import version_info # noqa: F401 | 22 | from ... import version_info # noqa: F401 |
4288 | 25 | 23 | ||
4289 | 26 | from ... import ( | 24 | from ... import ( |
4290 | 27 | 25 | ||
4291 | === modified file 'breezy/plugins/upload/__init__.py' | |||
4292 | --- breezy/plugins/upload/__init__.py 2018-11-18 19:48:57 +0000 | |||
4293 | +++ breezy/plugins/upload/__init__.py 2020-02-18 05:49:35 +0000 | |||
4294 | @@ -131,8 +131,6 @@ | |||
4295 | 131 | 131 | ||
4296 | 132 | """ | 132 | """ |
4297 | 133 | 133 | ||
4298 | 134 | from __future__ import absolute_import | ||
4299 | 135 | |||
4300 | 136 | # TODO: the chmod bits *can* be supported via the upload protocols | 134 | # TODO: the chmod bits *can* be supported via the upload protocols |
4301 | 137 | # (i.e. poorly), but since the web developers use these protocols to upload | 135 | # (i.e. poorly), but since the web developers use these protocols to upload |
4302 | 138 | # manually, it is expected that the associated web server is coherent with | 136 | # manually, it is expected that the associated web server is coherent with |
4303 | 139 | 137 | ||
4304 | === modified file 'breezy/plugins/upload/cmds.py' | |||
4305 | --- breezy/plugins/upload/cmds.py 2020-02-07 02:14:30 +0000 | |||
4306 | +++ breezy/plugins/upload/cmds.py 2020-02-18 05:49:35 +0000 | |||
4307 | @@ -16,8 +16,6 @@ | |||
4308 | 16 | 16 | ||
4309 | 17 | """bzr-upload command implementations.""" | 17 | """bzr-upload command implementations.""" |
4310 | 18 | 18 | ||
4311 | 19 | from __future__ import absolute_import | ||
4312 | 20 | |||
4313 | 21 | from ... import ( | 19 | from ... import ( |
4314 | 22 | commands, | 20 | commands, |
4315 | 23 | config, | 21 | config, |
4316 | 24 | 22 | ||
4317 | === modified file 'breezy/plugins/weave_fmt/__init__.py' | |||
4318 | --- breezy/plugins/weave_fmt/__init__.py 2018-11-11 04:08:32 +0000 | |||
4319 | +++ breezy/plugins/weave_fmt/__init__.py 2020-02-18 05:49:35 +0000 | |||
4320 | @@ -19,8 +19,6 @@ | |||
4321 | 19 | These were formats present in pre-1.0 version of Bazaar. | 19 | These were formats present in pre-1.0 version of Bazaar. |
4322 | 20 | """ | 20 | """ |
4323 | 21 | 21 | ||
4324 | 22 | from __future__ import absolute_import | ||
4325 | 23 | |||
4326 | 24 | # Since we are a built-in plugin we share the breezy version | 22 | # Since we are a built-in plugin we share the breezy version |
4327 | 25 | from ... import version_info # noqa: F401 | 23 | from ... import version_info # noqa: F401 |
4328 | 26 | 24 | ||
4329 | 27 | 25 | ||
4330 | === modified file 'breezy/plugins/weave_fmt/branch.py' | |||
4331 | --- breezy/plugins/weave_fmt/branch.py 2020-01-18 04:16:23 +0000 | |||
4332 | +++ breezy/plugins/weave_fmt/branch.py 2020-02-18 05:49:35 +0000 | |||
4333 | @@ -16,8 +16,6 @@ | |||
4334 | 16 | 16 | ||
4335 | 17 | """Weave-era branch implementations.""" | 17 | """Weave-era branch implementations.""" |
4336 | 18 | 18 | ||
4337 | 19 | from __future__ import absolute_import | ||
4338 | 20 | |||
4339 | 21 | from ... import ( | 19 | from ... import ( |
4340 | 22 | errors, | 20 | errors, |
4341 | 23 | lockable_files, | 21 | lockable_files, |
4342 | 24 | 22 | ||
4343 | === modified file 'breezy/plugins/weave_fmt/bzrdir.py' | |||
4344 | --- breezy/plugins/weave_fmt/bzrdir.py 2020-01-31 10:39:02 +0000 | |||
4345 | +++ breezy/plugins/weave_fmt/bzrdir.py 2020-02-18 05:49:35 +0000 | |||
4346 | @@ -16,8 +16,6 @@ | |||
4347 | 16 | 16 | ||
4348 | 17 | """Weave-era BzrDir formats.""" | 17 | """Weave-era BzrDir formats.""" |
4349 | 18 | 18 | ||
4350 | 19 | from __future__ import absolute_import | ||
4351 | 20 | |||
4352 | 21 | from io import BytesIO | 19 | from io import BytesIO |
4353 | 22 | 20 | ||
4354 | 23 | from ...bzr.bzrdir import ( | 21 | from ...bzr.bzrdir import ( |
4355 | 24 | 22 | ||
4356 | === modified file 'breezy/plugins/weave_fmt/repository.py' | |||
4357 | --- breezy/plugins/weave_fmt/repository.py 2020-02-07 02:14:30 +0000 | |||
4358 | +++ breezy/plugins/weave_fmt/repository.py 2020-02-18 05:49:35 +0000 | |||
4359 | @@ -20,8 +20,6 @@ | |||
4360 | 20 | ghosts. | 20 | ghosts. |
4361 | 21 | """ | 21 | """ |
4362 | 22 | 22 | ||
4363 | 23 | from __future__ import absolute_import | ||
4364 | 24 | |||
4365 | 25 | import gzip | 23 | import gzip |
4366 | 26 | from io import BytesIO | 24 | from io import BytesIO |
4367 | 27 | import os | 25 | import os |
4368 | 28 | 26 | ||
4369 | === modified file 'breezy/plugins/weave_fmt/store/__init__.py' | |||
4370 | --- breezy/plugins/weave_fmt/store/__init__.py 2018-11-17 16:53:10 +0000 | |||
4371 | +++ breezy/plugins/weave_fmt/store/__init__.py 2020-02-18 05:49:35 +0000 | |||
4372 | @@ -24,8 +24,6 @@ | |||
4373 | 24 | unique ID. | 24 | unique ID. |
4374 | 25 | """ | 25 | """ |
4375 | 26 | 26 | ||
4376 | 27 | from __future__ import absolute_import | ||
4377 | 28 | |||
4378 | 29 | import os | 27 | import os |
4379 | 30 | 28 | ||
4380 | 31 | from .... import ( | 29 | from .... import ( |
4381 | 32 | 30 | ||
4382 | === modified file 'breezy/plugins/weave_fmt/store/text.py' | |||
4383 | --- breezy/plugins/weave_fmt/store/text.py 2020-02-07 02:14:30 +0000 | |||
4384 | +++ breezy/plugins/weave_fmt/store/text.py 2020-02-18 05:49:35 +0000 | |||
4385 | @@ -20,8 +20,6 @@ | |||
4386 | 20 | do any sort of delta compression. | 20 | do any sort of delta compression. |
4387 | 21 | """ | 21 | """ |
4388 | 22 | 22 | ||
4389 | 23 | from __future__ import absolute_import | ||
4390 | 24 | |||
4391 | 25 | import gzip | 23 | import gzip |
4392 | 26 | from io import BytesIO | 24 | from io import BytesIO |
4393 | 27 | import os | 25 | import os |
4394 | 28 | 26 | ||
4395 | === modified file 'breezy/plugins/weave_fmt/store/versioned.py' | |||
4396 | --- breezy/plugins/weave_fmt/store/versioned.py 2018-11-11 04:08:32 +0000 | |||
4397 | +++ breezy/plugins/weave_fmt/store/versioned.py 2020-02-18 05:49:35 +0000 | |||
4398 | @@ -14,8 +14,6 @@ | |||
4399 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4400 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4401 | 16 | 16 | ||
4402 | 17 | from __future__ import absolute_import | ||
4403 | 18 | |||
4404 | 19 | # XXX: Some consideration of the problems that might occur if there are | 17 | # XXX: Some consideration of the problems that might occur if there are |
4405 | 20 | # files whose id differs only in case. That should probably be forbidden. | 18 | # files whose id differs only in case. That should probably be forbidden. |
4406 | 21 | 19 | ||
4407 | 22 | 20 | ||
4408 | === modified file 'breezy/plugins/weave_fmt/test_bzrdir.py' | |||
4409 | --- breezy/plugins/weave_fmt/test_bzrdir.py 2019-09-21 23:05:12 +0000 | |||
4410 | +++ breezy/plugins/weave_fmt/test_bzrdir.py 2020-02-18 05:49:35 +0000 | |||
4411 | @@ -19,8 +19,6 @@ | |||
4412 | 19 | For interface contract tests, see tests/per_bzr_dir. | 19 | For interface contract tests, see tests/per_bzr_dir. |
4413 | 20 | """ | 20 | """ |
4414 | 21 | 21 | ||
4415 | 22 | from __future__ import absolute_import | ||
4416 | 23 | |||
4417 | 24 | import os | 22 | import os |
4418 | 25 | import sys | 23 | import sys |
4419 | 26 | 24 | ||
4420 | 27 | 25 | ||
4421 | === modified file 'breezy/plugins/weave_fmt/test_repository.py' | |||
4422 | --- breezy/plugins/weave_fmt/test_repository.py 2020-02-07 02:14:30 +0000 | |||
4423 | +++ breezy/plugins/weave_fmt/test_repository.py 2020-02-18 05:49:35 +0000 | |||
4424 | @@ -20,8 +20,6 @@ | |||
4425 | 20 | 20 | ||
4426 | 21 | """ | 21 | """ |
4427 | 22 | 22 | ||
4428 | 23 | from __future__ import absolute_import | ||
4429 | 24 | |||
4430 | 25 | from io import BytesIO | 23 | from io import BytesIO |
4431 | 26 | from stat import S_ISDIR | 24 | from stat import S_ISDIR |
4432 | 27 | import sys | 25 | import sys |
4433 | 28 | 26 | ||
4434 | === modified file 'breezy/plugins/weave_fmt/test_workingtree.py' | |||
4435 | --- breezy/plugins/weave_fmt/test_workingtree.py 2019-02-14 03:30:18 +0000 | |||
4436 | +++ breezy/plugins/weave_fmt/test_workingtree.py 2020-02-18 05:49:35 +0000 | |||
4437 | @@ -17,8 +17,6 @@ | |||
4438 | 17 | 17 | ||
4439 | 18 | """Tests for weave-era working tree formats.""" | 18 | """Tests for weave-era working tree formats.""" |
4440 | 19 | 19 | ||
4441 | 20 | from __future__ import absolute_import | ||
4442 | 21 | |||
4443 | 22 | import os | 20 | import os |
4444 | 23 | 21 | ||
4445 | 24 | from ... import ( | 22 | from ... import ( |
4446 | 25 | 23 | ||
4447 | === modified file 'breezy/plugins/weave_fmt/workingtree.py' | |||
4448 | --- breezy/plugins/weave_fmt/workingtree.py 2020-02-07 02:14:30 +0000 | |||
4449 | +++ breezy/plugins/weave_fmt/workingtree.py 2020-02-18 05:49:35 +0000 | |||
4450 | @@ -16,8 +16,6 @@ | |||
4451 | 16 | 16 | ||
4452 | 17 | """Weave-era working tree objects.""" | 17 | """Weave-era working tree objects.""" |
4453 | 18 | 18 | ||
4454 | 19 | from __future__ import absolute_import | ||
4455 | 20 | |||
4456 | 21 | from io import BytesIO | 19 | from io import BytesIO |
4457 | 22 | 20 | ||
4458 | 23 | from ... import ( | 21 | from ... import ( |
4459 | 24 | 22 | ||
4460 | === modified file 'breezy/plugins/weave_fmt/xml4.py' | |||
4461 | --- breezy/plugins/weave_fmt/xml4.py 2020-01-31 02:56:40 +0000 | |||
4462 | +++ breezy/plugins/weave_fmt/xml4.py 2020-02-18 05:49:35 +0000 | |||
4463 | @@ -14,8 +14,6 @@ | |||
4464 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4465 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4466 | 16 | 16 | ||
4467 | 17 | from __future__ import absolute_import | ||
4468 | 18 | |||
4469 | 19 | from ...bzr.xml_serializer import ( | 17 | from ...bzr.xml_serializer import ( |
4470 | 20 | Element, | 18 | Element, |
4471 | 21 | SubElement, | 19 | SubElement, |
4472 | 22 | 20 | ||
4473 | === modified file 'breezy/plugins/zsh_completion/__init__.py' | |||
4474 | --- breezy/plugins/zsh_completion/__init__.py 2019-10-05 12:22:19 +0000 | |||
4475 | +++ breezy/plugins/zsh_completion/__init__.py 2020-02-18 05:49:35 +0000 | |||
4476 | @@ -14,8 +14,6 @@ | |||
4477 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4478 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4479 | 16 | 16 | ||
4480 | 17 | from __future__ import absolute_import | ||
4481 | 18 | |||
4482 | 19 | __doc__ = """Generate a shell function for zsh command line completion. | 17 | __doc__ = """Generate a shell function for zsh command line completion. |
4483 | 20 | """ | 18 | """ |
4484 | 21 | 19 | ||
4485 | 22 | 20 | ||
4486 | === modified file 'breezy/plugins/zsh_completion/zshcomp.py' | |||
4487 | --- breezy/plugins/zsh_completion/zshcomp.py 2020-02-07 02:14:30 +0000 | |||
4488 | +++ breezy/plugins/zsh_completion/zshcomp.py 2020-02-18 05:49:35 +0000 | |||
4489 | @@ -16,8 +16,6 @@ | |||
4490 | 16 | # along with this program; if not, write to the Free Software | 16 | # along with this program; if not, write to the Free Software |
4491 | 17 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 17 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4492 | 18 | 18 | ||
4493 | 19 | from __future__ import absolute_import | ||
4494 | 20 | |||
4495 | 21 | from ... import ( | 19 | from ... import ( |
4496 | 22 | cmdline, | 20 | cmdline, |
4497 | 23 | commands, | 21 | commands, |
4498 | 24 | 22 | ||
4499 | === modified file 'breezy/progress.py' | |||
4500 | --- breezy/progress.py 2018-11-12 01:41:38 +0000 | |||
4501 | +++ breezy/progress.py 2020-02-18 05:49:35 +0000 | |||
4502 | @@ -20,8 +20,6 @@ | |||
4503 | 20 | will manage a conceptual stack of nested activities. | 20 | will manage a conceptual stack of nested activities. |
4504 | 21 | """ | 21 | """ |
4505 | 22 | 22 | ||
4506 | 23 | from __future__ import absolute_import | ||
4507 | 24 | |||
4508 | 25 | import time | 23 | import time |
4509 | 26 | import os | 24 | import os |
4510 | 27 | 25 | ||
4511 | 28 | 26 | ||
4512 | === modified file 'breezy/propose.py' | |||
4513 | --- breezy/propose.py 2020-01-28 23:33:16 +0000 | |||
4514 | +++ breezy/propose.py 2020-02-18 05:49:35 +0000 | |||
4515 | @@ -16,8 +16,6 @@ | |||
4516 | 16 | 16 | ||
4517 | 17 | """Helper functions for proposing merges.""" | 17 | """Helper functions for proposing merges.""" |
4518 | 18 | 18 | ||
4519 | 19 | from __future__ import absolute_import | ||
4520 | 20 | |||
4521 | 21 | from . import ( | 19 | from . import ( |
4522 | 22 | errors, | 20 | errors, |
4523 | 23 | hooks, | 21 | hooks, |
4524 | 24 | 22 | ||
4525 | === modified file 'breezy/push.py' | |||
4526 | --- breezy/push.py 2019-06-29 19:54:32 +0000 | |||
4527 | +++ breezy/push.py 2020-02-18 05:49:35 +0000 | |||
4528 | @@ -16,8 +16,6 @@ | |||
4529 | 16 | 16 | ||
4530 | 17 | """UI helper for the push command.""" | 17 | """UI helper for the push command.""" |
4531 | 18 | 18 | ||
4532 | 19 | from __future__ import absolute_import | ||
4533 | 20 | |||
4534 | 21 | from . import ( | 19 | from . import ( |
4535 | 22 | branch as _mod_branch, | 20 | branch as _mod_branch, |
4536 | 23 | controldir, | 21 | controldir, |
4537 | 24 | 22 | ||
4538 | === modified file 'breezy/pyutils.py' | |||
4539 | --- breezy/pyutils.py 2018-11-11 04:08:32 +0000 | |||
4540 | +++ breezy/pyutils.py 2020-02-18 05:49:35 +0000 | |||
4541 | @@ -16,8 +16,6 @@ | |||
4542 | 16 | 16 | ||
4543 | 17 | """General Python convenience functions.""" | 17 | """General Python convenience functions.""" |
4544 | 18 | 18 | ||
4545 | 19 | from __future__ import absolute_import | ||
4546 | 20 | |||
4547 | 21 | import sys | 19 | import sys |
4548 | 22 | 20 | ||
4549 | 23 | 21 | ||
4550 | 24 | 22 | ||
4551 | === modified file 'breezy/reconcile.py' | |||
4552 | --- breezy/reconcile.py 2019-06-02 02:35:46 +0000 | |||
4553 | +++ breezy/reconcile.py 2020-02-18 05:49:35 +0000 | |||
4554 | @@ -16,8 +16,6 @@ | |||
4555 | 16 | 16 | ||
4556 | 17 | """Reconcilers are able to fix some potential data errors in a branch.""" | 17 | """Reconcilers are able to fix some potential data errors in a branch.""" |
4557 | 18 | 18 | ||
4558 | 19 | from __future__ import absolute_import | ||
4559 | 20 | |||
4560 | 21 | __all__ = [ | 19 | __all__ = [ |
4561 | 22 | 'reconcile', | 20 | 'reconcile', |
4562 | 23 | 'Reconciler', | 21 | 'Reconciler', |
4563 | 24 | 22 | ||
4564 | === modified file 'breezy/reconfigure.py' | |||
4565 | --- breezy/reconfigure.py 2019-06-26 20:58:23 +0000 | |||
4566 | +++ breezy/reconfigure.py 2020-02-18 05:49:35 +0000 | |||
4567 | @@ -20,8 +20,6 @@ | |||
4568 | 20 | constructing a class or using a factory method on Reconfigure. | 20 | constructing a class or using a factory method on Reconfigure. |
4569 | 21 | """ | 21 | """ |
4570 | 22 | 22 | ||
4571 | 23 | from __future__ import absolute_import | ||
4572 | 24 | |||
4573 | 25 | 23 | ||
4574 | 26 | from . import ( | 24 | from . import ( |
4575 | 27 | branch, | 25 | branch, |
4576 | 28 | 26 | ||
4577 | === modified file 'breezy/recordcounter.py' | |||
4578 | --- breezy/recordcounter.py 2018-11-11 04:08:32 +0000 | |||
4579 | +++ breezy/recordcounter.py 2020-02-18 05:49:35 +0000 | |||
4580 | @@ -16,8 +16,6 @@ | |||
4581 | 16 | 16 | ||
4582 | 17 | """Record counting support for showing progress of revision fetch.""" | 17 | """Record counting support for showing progress of revision fetch.""" |
4583 | 18 | 18 | ||
4584 | 19 | from __future__ import absolute_import | ||
4585 | 20 | |||
4586 | 21 | 19 | ||
4587 | 22 | class RecordCounter(object): | 20 | class RecordCounter(object): |
4588 | 23 | """Container for maintains estimates of work requires for fetch. | 21 | """Container for maintains estimates of work requires for fetch. |
4589 | 24 | 22 | ||
4590 | === modified file 'breezy/registry.py' | |||
4591 | --- breezy/registry.py 2020-02-07 02:14:30 +0000 | |||
4592 | +++ breezy/registry.py 2020-02-18 05:49:35 +0000 | |||
4593 | @@ -16,8 +16,6 @@ | |||
4594 | 16 | 16 | ||
4595 | 17 | """Classes to provide name-to-object registry-like support.""" | 17 | """Classes to provide name-to-object registry-like support.""" |
4596 | 18 | 18 | ||
4597 | 19 | from __future__ import absolute_import | ||
4598 | 20 | |||
4599 | 21 | from .pyutils import get_named_object | 19 | from .pyutils import get_named_object |
4600 | 22 | 20 | ||
4601 | 23 | 21 | ||
4602 | 24 | 22 | ||
4603 | === modified file 'breezy/rename_map.py' | |||
4604 | --- breezy/rename_map.py 2020-02-07 02:14:30 +0000 | |||
4605 | +++ breezy/rename_map.py 2020-02-18 05:49:35 +0000 | |||
4606 | @@ -14,8 +14,6 @@ | |||
4607 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4608 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4609 | 16 | 16 | ||
4610 | 17 | from __future__ import absolute_import | ||
4611 | 18 | |||
4612 | 19 | from io import BytesIO | 17 | from io import BytesIO |
4613 | 20 | 18 | ||
4614 | 21 | from . import ( | 19 | from . import ( |
4615 | 22 | 20 | ||
4616 | === modified file 'breezy/repository.py' | |||
4617 | --- breezy/repository.py 2020-02-07 02:14:30 +0000 | |||
4618 | +++ breezy/repository.py 2020-02-18 05:49:35 +0000 | |||
4619 | @@ -14,8 +14,6 @@ | |||
4620 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4621 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4622 | 16 | 16 | ||
4623 | 17 | from __future__ import absolute_import | ||
4624 | 18 | |||
4625 | 19 | from .lazy_import import lazy_import | 17 | from .lazy_import import lazy_import |
4626 | 20 | lazy_import(globals(), """ | 18 | lazy_import(globals(), """ |
4627 | 21 | import time | 19 | import time |
4628 | 22 | 20 | ||
4629 | === modified file 'breezy/revision.py' | |||
4630 | --- breezy/revision.py 2020-02-07 02:14:30 +0000 | |||
4631 | +++ breezy/revision.py 2020-02-18 05:49:35 +0000 | |||
4632 | @@ -14,8 +14,6 @@ | |||
4633 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4634 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4635 | 16 | 16 | ||
4636 | 17 | from __future__ import absolute_import | ||
4637 | 18 | |||
4638 | 19 | # TODO: Some kind of command-line display of revision properties: | 17 | # TODO: Some kind of command-line display of revision properties: |
4639 | 20 | # perhaps show them in log -v and allow them as options to the commit command. | 18 | # perhaps show them in log -v and allow them as options to the commit command. |
4640 | 21 | 19 | ||
4641 | 22 | 20 | ||
4642 | === modified file 'breezy/revisionspec.py' | |||
4643 | --- breezy/revisionspec.py 2020-02-07 02:14:30 +0000 | |||
4644 | +++ breezy/revisionspec.py 2020-02-18 05:49:35 +0000 | |||
4645 | @@ -14,8 +14,6 @@ | |||
4646 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4647 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4648 | 16 | 16 | ||
4649 | 17 | from __future__ import absolute_import | ||
4650 | 18 | |||
4651 | 19 | 17 | ||
4652 | 20 | from .lazy_import import lazy_import | 18 | from .lazy_import import lazy_import |
4653 | 21 | lazy_import(globals(), """ | 19 | lazy_import(globals(), """ |
4654 | 22 | 20 | ||
4655 | === modified file 'breezy/revisiontree.py' | |||
4656 | --- breezy/revisiontree.py 2018-11-16 18:33:17 +0000 | |||
4657 | +++ breezy/revisiontree.py 2020-02-18 05:49:35 +0000 | |||
4658 | @@ -16,8 +16,6 @@ | |||
4659 | 16 | 16 | ||
4660 | 17 | """RevisionTree - a Tree implementation backed by repository data for a revision.""" | 17 | """RevisionTree - a Tree implementation backed by repository data for a revision.""" |
4661 | 18 | 18 | ||
4662 | 19 | from __future__ import absolute_import | ||
4663 | 20 | |||
4664 | 21 | from io import BytesIO | 19 | from io import BytesIO |
4665 | 22 | from . import ( | 20 | from . import ( |
4666 | 23 | lock, | 21 | lock, |
4667 | 24 | 22 | ||
4668 | === modified file 'breezy/rio.py' | |||
4669 | --- breezy/rio.py 2020-02-07 02:14:30 +0000 | |||
4670 | +++ breezy/rio.py 2020-02-18 05:49:35 +0000 | |||
4671 | @@ -14,8 +14,6 @@ | |||
4672 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4673 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4674 | 16 | 16 | ||
4675 | 17 | from __future__ import absolute_import | ||
4676 | 18 | |||
4677 | 19 | # \subsection{\emph{rio} - simple text metaformat} | 17 | # \subsection{\emph{rio} - simple text metaformat} |
4678 | 20 | # | 18 | # |
4679 | 21 | # \emph{r} stands for `restricted', `reproducible', or `rfc822-like'. | 19 | # \emph{r} stands for `restricted', `reproducible', or `rfc822-like'. |
4680 | 22 | 20 | ||
4681 | === modified file 'breezy/rules.py' | |||
4682 | --- breezy/rules.py 2019-06-16 01:03:51 +0000 | |||
4683 | +++ breezy/rules.py 2020-02-18 05:49:35 +0000 | |||
4684 | @@ -19,8 +19,6 @@ | |||
4685 | 19 | See ``bzr help rules`` for details. | 19 | See ``bzr help rules`` for details. |
4686 | 20 | """ | 20 | """ |
4687 | 21 | 21 | ||
4688 | 22 | from __future__ import absolute_import | ||
4689 | 23 | |||
4690 | 24 | import configobj | 22 | import configobj |
4691 | 25 | 23 | ||
4692 | 26 | from . import ( | 24 | from . import ( |
4693 | 27 | 25 | ||
4694 | === modified file 'breezy/send.py' | |||
4695 | --- breezy/send.py 2019-06-29 19:54:32 +0000 | |||
4696 | +++ breezy/send.py 2020-02-18 05:49:35 +0000 | |||
4697 | @@ -14,8 +14,6 @@ | |||
4698 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4699 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4700 | 16 | 16 | ||
4701 | 17 | from __future__ import absolute_import | ||
4702 | 18 | |||
4703 | 19 | import os | 17 | import os |
4704 | 20 | import time | 18 | import time |
4705 | 21 | 19 | ||
4706 | 22 | 20 | ||
4707 | === modified file 'breezy/shelf.py' | |||
4708 | --- breezy/shelf.py 2019-06-22 11:16:17 +0000 | |||
4709 | +++ breezy/shelf.py 2020-02-18 05:49:35 +0000 | |||
4710 | @@ -14,8 +14,6 @@ | |||
4711 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4712 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4713 | 16 | 16 | ||
4714 | 17 | from __future__ import absolute_import | ||
4715 | 18 | |||
4716 | 19 | import errno | 17 | import errno |
4717 | 20 | import re | 18 | import re |
4718 | 21 | 19 | ||
4719 | 22 | 20 | ||
4720 | === modified file 'breezy/shelf_ui.py' | |||
4721 | --- breezy/shelf_ui.py 2020-02-07 02:14:30 +0000 | |||
4722 | +++ breezy/shelf_ui.py 2020-02-18 05:49:35 +0000 | |||
4723 | @@ -14,8 +14,6 @@ | |||
4724 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4725 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4726 | 16 | 16 | ||
4727 | 17 | from __future__ import absolute_import | ||
4728 | 18 | |||
4729 | 19 | import contextlib | 17 | import contextlib |
4730 | 20 | import patiencediff | 18 | import patiencediff |
4731 | 21 | import shutil | 19 | import shutil |
4732 | 22 | 20 | ||
4733 | === modified file 'breezy/shellcomplete.py' | |||
4734 | --- breezy/shellcomplete.py 2018-11-11 04:08:32 +0000 | |||
4735 | +++ breezy/shellcomplete.py 2020-02-18 05:49:35 +0000 | |||
4736 | @@ -14,8 +14,6 @@ | |||
4737 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4738 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4739 | 16 | 16 | ||
4740 | 17 | from __future__ import absolute_import | ||
4741 | 18 | |||
4742 | 19 | import sys | 17 | import sys |
4743 | 20 | 18 | ||
4744 | 21 | 19 | ||
4745 | 22 | 20 | ||
4746 | === modified file 'breezy/smtp_connection.py' | |||
4747 | --- breezy/smtp_connection.py 2020-02-07 02:14:30 +0000 | |||
4748 | +++ breezy/smtp_connection.py 2020-02-18 05:49:35 +0000 | |||
4749 | @@ -16,8 +16,6 @@ | |||
4750 | 16 | 16 | ||
4751 | 17 | """A convenience class around smtplib.""" | 17 | """A convenience class around smtplib.""" |
4752 | 18 | 18 | ||
4753 | 19 | from __future__ import absolute_import | ||
4754 | 20 | |||
4755 | 21 | from email.utils import getaddresses, parseaddr | 19 | from email.utils import getaddresses, parseaddr |
4756 | 22 | 20 | ||
4757 | 23 | import errno | 21 | import errno |
4758 | 24 | 22 | ||
4759 | === modified file 'breezy/static_tuple.py' | |||
4760 | --- breezy/static_tuple.py 2017-05-22 00:56:52 +0000 | |||
4761 | +++ breezy/static_tuple.py 2020-02-18 05:49:35 +0000 | |||
4762 | @@ -16,8 +16,6 @@ | |||
4763 | 16 | 16 | ||
4764 | 17 | """Interface thunk for a StaticTuple implementation.""" | 17 | """Interface thunk for a StaticTuple implementation.""" |
4765 | 18 | 18 | ||
4766 | 19 | from __future__ import absolute_import | ||
4767 | 20 | |||
4768 | 21 | from . import debug | 19 | from . import debug |
4769 | 22 | 20 | ||
4770 | 23 | try: | 21 | try: |
4771 | 24 | 22 | ||
4772 | === modified file 'breezy/status.py' | |||
4773 | --- breezy/status.py 2019-06-29 19:50:18 +0000 | |||
4774 | +++ breezy/status.py 2020-02-18 05:49:35 +0000 | |||
4775 | @@ -14,8 +14,6 @@ | |||
4776 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4777 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4778 | 16 | 16 | ||
4779 | 17 | from __future__ import absolute_import | ||
4780 | 18 | |||
4781 | 19 | import sys | 17 | import sys |
4782 | 20 | 18 | ||
4783 | 21 | from . import ( | 19 | from . import ( |
4784 | 22 | 20 | ||
4785 | === modified file 'breezy/strace.py' | |||
4786 | --- breezy/strace.py 2018-11-12 01:41:38 +0000 | |||
4787 | +++ breezy/strace.py 2020-02-18 05:49:35 +0000 | |||
4788 | @@ -17,8 +17,6 @@ | |||
4789 | 17 | 17 | ||
4790 | 18 | """Support for running strace against the current process.""" | 18 | """Support for running strace against the current process.""" |
4791 | 19 | 19 | ||
4792 | 20 | from __future__ import absolute_import | ||
4793 | 21 | |||
4794 | 22 | import os | 20 | import os |
4795 | 23 | import signal | 21 | import signal |
4796 | 24 | import subprocess | 22 | import subprocess |
4797 | 25 | 23 | ||
4798 | === modified file 'breezy/switch.py' | |||
4799 | --- breezy/switch.py 2019-06-16 19:15:57 +0000 | |||
4800 | +++ breezy/switch.py 2020-02-18 05:49:35 +0000 | |||
4801 | @@ -14,8 +14,6 @@ | |||
4802 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4803 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4804 | 16 | 16 | ||
4805 | 17 | from __future__ import absolute_import | ||
4806 | 18 | |||
4807 | 19 | # Original author: David Allouche | 17 | # Original author: David Allouche |
4808 | 20 | 18 | ||
4809 | 21 | from . import ( | 19 | from . import ( |
4810 | 22 | 20 | ||
4811 | === modified file 'breezy/symbol_versioning.py' | |||
4812 | --- breezy/symbol_versioning.py 2019-01-04 20:49:00 +0000 | |||
4813 | +++ breezy/symbol_versioning.py 2020-02-18 05:49:35 +0000 | |||
4814 | @@ -19,8 +19,6 @@ | |||
4815 | 19 | The methods here allow for api symbol versioning. | 19 | The methods here allow for api symbol versioning. |
4816 | 20 | """ | 20 | """ |
4817 | 21 | 21 | ||
4818 | 22 | from __future__ import absolute_import | ||
4819 | 23 | |||
4820 | 24 | __all__ = ['deprecated_function', | 22 | __all__ = ['deprecated_function', |
4821 | 25 | 'deprecated_in', | 23 | 'deprecated_in', |
4822 | 26 | 'deprecated_list', | 24 | 'deprecated_list', |
4823 | 27 | 25 | ||
4824 | === modified file 'breezy/tag.py' | |||
4825 | --- breezy/tag.py 2020-02-07 02:14:30 +0000 | |||
4826 | +++ breezy/tag.py 2020-02-18 05:49:35 +0000 | |||
4827 | @@ -22,8 +22,6 @@ | |||
4828 | 22 | Branch.tags.add('name', 'value') | 22 | Branch.tags.add('name', 'value') |
4829 | 23 | """ | 23 | """ |
4830 | 24 | 24 | ||
4831 | 25 | from __future__ import absolute_import | ||
4832 | 26 | |||
4833 | 27 | from collections import defaultdict | 25 | from collections import defaultdict |
4834 | 28 | import contextlib | 26 | import contextlib |
4835 | 29 | 27 | ||
4836 | 30 | 28 | ||
4837 | === modified file 'breezy/terminal.py' | |||
4838 | --- breezy/terminal.py 2020-01-31 02:14:55 +0000 | |||
4839 | +++ breezy/terminal.py 2020-02-18 05:49:35 +0000 | |||
4840 | @@ -15,8 +15,6 @@ | |||
4841 | 15 | # along with this program; if not, write to the Free Software | 15 | # along with this program; if not, write to the Free Software |
4842 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4843 | 17 | 17 | ||
4844 | 18 | from __future__ import absolute_import | ||
4845 | 19 | |||
4846 | 20 | import os | 18 | import os |
4847 | 21 | import sys | 19 | import sys |
4848 | 22 | 20 | ||
4849 | 23 | 21 | ||
4850 | === modified file 'breezy/tests/__init__.py' | |||
4851 | --- breezy/tests/__init__.py 2020-02-13 23:57:28 +0000 | |||
4852 | +++ breezy/tests/__init__.py 2020-02-18 05:49:35 +0000 | |||
4853 | @@ -16,8 +16,6 @@ | |||
4854 | 16 | 16 | ||
4855 | 17 | """Testing framework extensions""" | 17 | """Testing framework extensions""" |
4856 | 18 | 18 | ||
4857 | 19 | from __future__ import absolute_import | ||
4858 | 20 | |||
4859 | 21 | # NOTE: Some classes in here use camelCaseNaming() rather than | 19 | # NOTE: Some classes in here use camelCaseNaming() rather than |
4860 | 22 | # underscore_naming(). That's for consistency with unittest; it's not the | 20 | # underscore_naming(). That's for consistency with unittest; it's not the |
4861 | 23 | # general style of breezy. Please continue that consistency when adding e.g. | 21 | # general style of breezy. Please continue that consistency when adding e.g. |
4862 | 24 | 22 | ||
4863 | === modified file 'breezy/tests/blackbox/test_bisect.py' | |||
4864 | --- breezy/tests/blackbox/test_bisect.py 2019-03-05 09:17:49 +0000 | |||
4865 | +++ breezy/tests/blackbox/test_bisect.py 2020-02-18 05:49:35 +0000 | |||
4866 | @@ -17,8 +17,6 @@ | |||
4867 | 17 | 17 | ||
4868 | 18 | """Tests of the 'brz bisect' command.""" | 18 | """Tests of the 'brz bisect' command.""" |
4869 | 19 | 19 | ||
4870 | 20 | from __future__ import absolute_import | ||
4871 | 21 | |||
4872 | 22 | import os | 20 | import os |
4873 | 23 | import shutil | 21 | import shutil |
4874 | 24 | import stat | 22 | import stat |
4875 | 25 | 23 | ||
4876 | === modified file 'breezy/tests/blackbox/test_log.py' | |||
4877 | --- breezy/tests/blackbox/test_log.py 2020-02-07 02:14:30 +0000 | |||
4878 | +++ breezy/tests/blackbox/test_log.py 2020-02-18 05:49:35 +0000 | |||
4879 | @@ -17,8 +17,6 @@ | |||
4880 | 17 | 17 | ||
4881 | 18 | """Black-box tests for brz log.""" | 18 | """Black-box tests for brz log.""" |
4882 | 19 | 19 | ||
4883 | 20 | from __future__ import absolute_import | ||
4884 | 21 | |||
4885 | 22 | 20 | ||
4886 | 23 | import os | 21 | import os |
4887 | 24 | 22 | ||
4888 | 25 | 23 | ||
4889 | === modified file 'breezy/tests/features.py' | |||
4890 | --- breezy/tests/features.py 2019-05-28 21:46:09 +0000 | |||
4891 | +++ breezy/tests/features.py 2020-02-18 05:49:35 +0000 | |||
4892 | @@ -17,8 +17,6 @@ | |||
4893 | 17 | """A collection of commonly used 'Features' to optionally run tests. | 17 | """A collection of commonly used 'Features' to optionally run tests. |
4894 | 18 | """ | 18 | """ |
4895 | 19 | 19 | ||
4896 | 20 | from __future__ import absolute_import | ||
4897 | 21 | |||
4898 | 22 | import importlib | 20 | import importlib |
4899 | 23 | import os | 21 | import os |
4900 | 24 | import subprocess | 22 | import subprocess |
4901 | 25 | 23 | ||
4902 | === modified file 'breezy/tests/test__rio.py' | |||
4903 | --- breezy/tests/test__rio.py 2020-02-07 02:14:30 +0000 | |||
4904 | +++ breezy/tests/test__rio.py 2020-02-18 05:49:35 +0000 | |||
4905 | @@ -16,8 +16,6 @@ | |||
4906 | 16 | 16 | ||
4907 | 17 | """Tests for _rio_*.""" | 17 | """Tests for _rio_*.""" |
4908 | 18 | 18 | ||
4909 | 19 | from __future__ import absolute_import | ||
4910 | 20 | |||
4911 | 21 | from .. import ( | 19 | from .. import ( |
4912 | 22 | rio, | 20 | rio, |
4913 | 23 | tests, | 21 | tests, |
4914 | 24 | 22 | ||
4915 | === modified file 'breezy/tests/test_bisect.py' | |||
4916 | --- breezy/tests/test_bisect.py 2020-02-07 02:14:30 +0000 | |||
4917 | +++ breezy/tests/test_bisect.py 2020-02-18 05:49:35 +0000 | |||
4918 | @@ -16,8 +16,6 @@ | |||
4919 | 16 | 16 | ||
4920 | 17 | "Test suite for the bzr bisect plugin." | 17 | "Test suite for the bzr bisect plugin." |
4921 | 18 | 18 | ||
4922 | 19 | from __future__ import absolute_import | ||
4923 | 20 | |||
4924 | 21 | from io import StringIO | 19 | from io import StringIO |
4925 | 22 | import os | 20 | import os |
4926 | 23 | import shutil | 21 | import shutil |
4927 | 24 | 22 | ||
4928 | === modified file 'breezy/tests/test_fetch_ghosts.py' | |||
4929 | --- breezy/tests/test_fetch_ghosts.py 2018-05-22 02:05:12 +0000 | |||
4930 | +++ breezy/tests/test_fetch_ghosts.py 2020-02-18 05:49:35 +0000 | |||
4931 | @@ -14,8 +14,6 @@ | |||
4932 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4933 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4934 | 16 | 16 | ||
4935 | 17 | from __future__ import absolute_import | ||
4936 | 18 | |||
4937 | 19 | from ..fetch_ghosts import GhostFetcher | 17 | from ..fetch_ghosts import GhostFetcher |
4938 | 20 | from . import TestCaseWithTransport | 18 | from . import TestCaseWithTransport |
4939 | 21 | 19 | ||
4940 | 22 | 20 | ||
4941 | === modified file 'breezy/tests/test_grep.py' | |||
4942 | --- breezy/tests/test_grep.py 2020-02-07 02:14:30 +0000 | |||
4943 | +++ breezy/tests/test_grep.py 2020-02-18 05:49:35 +0000 | |||
4944 | @@ -14,8 +14,6 @@ | |||
4945 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
4946 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
4947 | 16 | 16 | ||
4948 | 17 | from __future__ import absolute_import | ||
4949 | 18 | |||
4950 | 19 | import os | 17 | import os |
4951 | 20 | import re | 18 | import re |
4952 | 21 | import unicodedata as ud | 19 | import unicodedata as ud |
4953 | 22 | 20 | ||
4954 | === modified file 'breezy/tests/test_osutils.py' | |||
4955 | --- breezy/tests/test_osutils.py 2020-02-07 02:14:30 +0000 | |||
4956 | +++ breezy/tests/test_osutils.py 2020-02-18 05:49:35 +0000 | |||
4957 | @@ -16,8 +16,6 @@ | |||
4958 | 16 | 16 | ||
4959 | 17 | """Tests for the osutils wrapper.""" | 17 | """Tests for the osutils wrapper.""" |
4960 | 18 | 18 | ||
4961 | 19 | from __future__ import absolute_import, division | ||
4962 | 20 | |||
4963 | 21 | import errno | 19 | import errno |
4964 | 22 | from io import BytesIO | 20 | from io import BytesIO |
4965 | 23 | import os | 21 | import os |
4966 | 24 | 22 | ||
4967 | === modified file 'breezy/tests/test_source.py' | |||
4968 | --- breezy/tests/test_source.py 2019-06-02 05:13:10 +0000 | |||
4969 | +++ breezy/tests/test_source.py 2020-02-18 05:49:35 +0000 | |||
4970 | @@ -444,23 +444,3 @@ | |||
4971 | 444 | error_msg.extend(('', '')) | 444 | error_msg.extend(('', '')) |
4972 | 445 | if error_msg: | 445 | if error_msg: |
4973 | 446 | self.fail('\n'.join(error_msg)) | 446 | self.fail('\n'.join(error_msg)) |
4974 | 447 | |||
4975 | 448 | def test_feature_absolute_import(self): | ||
4976 | 449 | """Using absolute imports means avoiding unnecesary stat and | ||
4977 | 450 | open calls. | ||
4978 | 451 | |||
4979 | 452 | Make sure that all non-test files have absolute imports enabled. | ||
4980 | 453 | """ | ||
4981 | 454 | missing_absolute_import = [] | ||
4982 | 455 | for fname, text in self.get_source_file_contents( | ||
4983 | 456 | extensions=('.py', '.pyx')): | ||
4984 | 457 | if "/tests/" in fname or "test_" in fname: | ||
4985 | 458 | # We don't really care about tests | ||
4986 | 459 | continue | ||
4987 | 460 | if "from __future__ import absolute_import" not in text: | ||
4988 | 461 | missing_absolute_import.append(fname) | ||
4989 | 462 | |||
4990 | 463 | if missing_absolute_import: | ||
4991 | 464 | self.fail( | ||
4992 | 465 | 'The following files do not have absolute_import enabled:\n' | ||
4993 | 466 | '\n' + '\n'.join(missing_absolute_import)) | ||
4994 | 467 | 447 | ||
4995 | === modified file 'breezy/tests/test_views.py' | |||
4996 | --- breezy/tests/test_views.py 2018-11-11 04:08:32 +0000 | |||
4997 | +++ breezy/tests/test_views.py 2020-02-18 05:49:35 +0000 | |||
4998 | @@ -14,8 +14,6 @@ | |||
4999 | 14 | # along with this program; if not, write to the Free Software | 14 | # along with this program; if not, write to the Free Software |
5000 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
The diff has been truncated for viewing.
There was nothing to merge /ci.breezy- vcs.org/ job/brz/ job/brz- land/717/
https:/