diff -Nru codetree-0.1.5/.bzr/branch/branch.conf codetree-1.2.0/.bzr/branch/branch.conf
--- codetree-0.1.5/.bzr/branch/branch.conf	2017-07-04 09:35:50.000000000 +0000
+++ codetree-1.2.0/.bzr/branch/branch.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-parent_location = bzr+ssh://bazaar.launchpad.net/+branch/codetree/
-submit_branch = bzr+ssh://bazaar.launchpad.net/~aluria/codetree/limit-concurrent-codetree-build/
-push_location = bzr+ssh://bazaar.launchpad.net/+branch/codetree/
diff -Nru codetree-0.1.5/.bzr/branch/format codetree-1.2.0/.bzr/branch/format
--- codetree-0.1.5/.bzr/branch/format	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/.bzr/branch/format	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Bazaar Branch Format 7 (needs bzr 1.6)
diff -Nru codetree-0.1.5/.bzr/branch/last-revision codetree-1.2.0/.bzr/branch/last-revision
--- codetree-0.1.5/.bzr/branch/last-revision	2017-07-04 09:35:43.000000000 +0000
+++ codetree-1.2.0/.bzr/branch/last-revision	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-96 tom.haddon@canonical.com-20170704093543-152z0b278hbxf6xp
diff -Nru codetree-0.1.5/.bzr/branch-format codetree-1.2.0/.bzr/branch-format
--- codetree-0.1.5/.bzr/branch-format	2017-07-04 09:16:40.000000000 +0000
+++ codetree-1.2.0/.bzr/branch-format	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Bazaar-NG meta directory, format 1
diff -Nru codetree-0.1.5/.bzr/checkout/conflicts codetree-1.2.0/.bzr/checkout/conflicts
--- codetree-0.1.5/.bzr/checkout/conflicts	2017-07-04 09:16:50.000000000 +0000
+++ codetree-1.2.0/.bzr/checkout/conflicts	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-BZR conflict list format 1
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/checkout/dirstate and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/checkout/dirstate differ
diff -Nru codetree-0.1.5/.bzr/checkout/format codetree-1.2.0/.bzr/checkout/format
--- codetree-0.1.5/.bzr/checkout/format	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/.bzr/checkout/format	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Bazaar Working Tree Format 6 (bzr 1.14)
diff -Nru codetree-0.1.5/.bzr/checkout/merge-hashes codetree-1.2.0/.bzr/checkout/merge-hashes
--- codetree-0.1.5/.bzr/checkout/merge-hashes	2017-07-04 09:16:50.000000000 +0000
+++ codetree-1.2.0/.bzr/checkout/merge-hashes	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-BZR merge-modified list format 1
-file_id: gitconfig-20170703103515-dkygxwu47wvd2eeq-1
-hash: e6bf284a0329597cef526adad05e1bf5622a59df
-
-file_id: testrequirements.txt-20170630152434-cnrr8f74y6iao1fw-1
-hash: e2d2d8999eb039b33d03ee0f213fce62d1a3e466
-
-file_id: hacking-20150330220810-d020v04412gqqnxn-1
-hash: bbf1a80b71e57c567dcbbf57217e44dba53d26c3
-
-file_id: Makefile
-hash: f040240a3e942851ff152df4422c3c8cde9bf469
-
-file_id: tox.ini-20170703103515-dkygxwu47wvd2eeq-2
-hash: 66b453d00dc8323d56502831bab3059531066fe6
-
-file_id: test_config.py-20150507134700-6gdtcstzfahhxqkz-6
-hash: d164be6a61242a477a52ea6b6073a7181dc9e88f
-
-file_id: codetree/config.py
-hash: 70f1a52e4b8d20d2d9fcc2ccc38859e36bb9a87d
diff -Nru codetree-0.1.5/.bzr/README codetree-1.2.0/.bzr/README
--- codetree-0.1.5/.bzr/README	2017-07-04 09:16:40.000000000 +0000
+++ codetree-1.2.0/.bzr/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-This is a Bazaar control directory.
-Do not change any files in this directory.
-See http://bazaar.canonical.com/ for more information about Bazaar.
diff -Nru codetree-0.1.5/.bzr/repository/format codetree-1.2.0/.bzr/repository/format
--- codetree-0.1.5/.bzr/repository/format	2017-07-04 09:16:40.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/format	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Bazaar repository format 2a (needs bzr 1.16 or later)
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.cix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.cix differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.iix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.iix differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.rix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.rix differ
diff -Nru codetree-0.1.5/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.six codetree-1.2.0/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.six
--- codetree-0.1.5/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.six	2017-07-04 09:16:50.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.six	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=
diff -Nru codetree-0.1.5/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.tix codetree-1.2.0/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.tix
--- codetree-0.1.5/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.tix	2017-07-04 09:16:50.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/indices/02894b2c98926ccc1e6f7b80c571a28a.tix	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=1
-key_elements=2
-len=7
-row_lengths=1
-x���Mn�0�{�)��I��,F���c��04���4Q�hF��MY�U�{�\�v��:��[�]�'�-z�<:�d���&�
U��S�r��cix��n��OS������M�p)<�]�RE)/)#ʪ���2؀[#��*����K*2,���_��������q��eN�)�w�OFRwIl{k��,�u�q �@�O�;6U.iv֦u��.�s`*
-�������C�gX�8[���{+��σp����%���/�R�<�_�,��?>m)A�7@dc���V��yڍ��u|��s��'q�݈=�8q}��<Ya�b�8V�7�t������� U)X�Z8������	�3��2{�.\�
\ No newline at end of file
diff -Nru codetree-0.1.5/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.cix codetree-1.2.0/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.cix
--- codetree-0.1.5/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.cix	2017-07-04 09:35:43.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.cix	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=1
-row_lengths=1
-x���
�0@�L��E$��[Hа=w�w�~9#='�ɘj^8&^a�H�W���ټR�e
�tH.��
�H;�
\ No newline at end of file
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.iix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.iix differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.rix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.rix differ
diff -Nru codetree-0.1.5/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.six codetree-1.2.0/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.six
--- codetree-0.1.5/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.six	2017-07-04 09:35:43.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.six	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.tix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/0b738a49775c80b5c717aa547fe6a727.tix differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.cix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.cix differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.iix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.iix differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.rix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.rix differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.six and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.six differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.tix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/0e61f2b6227f11ce3113c6ad3ccf53fd.tix differ
diff -Nru codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.cix codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.cix
--- codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.cix	2017-07-04 09:32:53.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.cix	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=
diff -Nru codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.iix codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.iix
--- codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.iix	2017-07-04 09:32:53.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.iix	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=1
-key_elements=1
-len=1
-row_lengths=1
-x�m��
�0@Q�H���3��C��2�,V� 0AN�I
����MO?�\�ڕ�M�e8���֤ d(5��8�X�FЌ�VeR^K�>W�Vk�Ik-R��KQ9�F�`��=�����KJ��P�r���CE=��l�����?5
\ No newline at end of file
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.rix and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.rix differ
diff -Nru codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.six codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.six
--- codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.six	2017-07-04 09:32:53.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.six	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=0
-row_lengths=
diff -Nru codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.tix codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.tix
--- codetree-0.1.5/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.tix	2017-07-04 09:32:53.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/indices/87665da336fe11bab820f7a6ffa6d304.tix	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=1
-key_elements=2
-len=0
-row_lengths=
diff -Nru codetree-0.1.5/.bzr/repository/pack-names codetree-1.2.0/.bzr/repository/pack-names
--- codetree-0.1.5/.bzr/repository/pack-names	2017-07-04 09:35:43.000000000 +0000
+++ codetree-1.2.0/.bzr/repository/pack-names	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-B+Tree Graph Index 2
-node_ref_lists=0
-key_elements=1
-len=4
-row_lengths=1
-x�͹
1DэU�J�%�
-\�#��{L8�����{G5 ��(�O��ĭe�!�a��u��v�F�,c�f#�HC�b�5��D�<;!?р[�h)�bnF�Ը9��}"!<���G׎v`<577�q��F\���,�*�f��"�N�x��7J5�
\ No newline at end of file
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/packs/02894b2c98926ccc1e6f7b80c571a28a.pack and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/packs/02894b2c98926ccc1e6f7b80c571a28a.pack differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/packs/0b738a49775c80b5c717aa547fe6a727.pack and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/packs/0b738a49775c80b5c717aa547fe6a727.pack differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/packs/0e61f2b6227f11ce3113c6ad3ccf53fd.pack and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/packs/0e61f2b6227f11ce3113c6ad3ccf53fd.pack differ
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.bzr/repository/packs/87665da336fe11bab820f7a6ffa6d304.pack and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.bzr/repository/packs/87665da336fe11bab820f7a6ffa6d304.pack differ
diff -Nru codetree-0.1.5/.bzrignore codetree-1.2.0/.bzrignore
--- codetree-0.1.5/.bzrignore	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/.bzrignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-nosetests.xml
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-.idea
-
-# Vi
-.*.swp
diff -Nru codetree-0.1.5/codetree/cli.py codetree-1.2.0/codetree/cli.py
--- codetree-0.1.5/codetree/cli.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/codetree/cli.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,3 +1,4 @@
+from __future__ import division, print_function
 from argparse import ArgumentParser
 import logging
 from .config import Config
diff -Nru codetree-0.1.5/codetree/config.py codetree-1.2.0/codetree/config.py
--- codetree-0.1.5/codetree/config.py	2017-07-04 09:16:50.000000000 +0000
+++ codetree-1.2.0/codetree/config.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,10 +1,17 @@
+from __future__ import division, print_function
+import datetime
 import fileinput
+import fnmatch
+from hashlib import sha256
+from io import open
 import logging
 import os
+import yaml
 
 import concurrent.futures
-from six.moves.urllib.parse import urlparse
 
+from . import six
+from .six.moves.urllib.parse import urlparse
 from .handlers import handler_for_url
 
 
@@ -40,8 +47,49 @@
             url = source
         return url, options
 
+    def collect_hashes(self, dir_to_hash):
+        # Get sha256sums of all files in the downloaded directory
+        hashes = {}
+        for root, dirnames, filenames in os.walk(dir_to_hash):
+            for filename in fnmatch.filter(filenames, '*'):
+                relative_filename = os.path.relpath(os.path.join(root, filename), dir_to_hash)
+                # Ignore hidden files and directories per lp#1725313, as well as the
+                # yaml file we're creating.
+                if not relative_filename.startswith('.') and not filename == 'codetree-collect-info.yaml':
+                    try:
+                        with open(os.path.join(root, filename), 'rb') as f:
+                            hashes[relative_filename] = sha256(f.read()).hexdigest()
+                    except IOError:
+                        # Ignore dangling symlinks and recursive symlinks
+                        pass
+        return hashes
+
+    def collect_info(self, result):
+        # This is used to help us reconstruct the actual versions of sources
+        # that were collected (if we want to do that).
+        collect_info = {"collect_date": "{}".format(datetime.datetime.now())}
+        if result is True:
+            collect_info["collect_url"] = "Unknown"
+        else:
+            if result.collect_location == "@":
+                # No need to create a build_info file for an empty directory
+                return {}
+            collect_info["collect_url"] = "{}".format(result.collect_location)
+            collect_info["hashes"] = self.collect_hashes(result.dest)
+        return collect_info
+
     def run(self):
-        return self.source.get(self.location, self.source_options)
+        # Remove existing collect info file lp#1731898
+        collect_info_path = os.path.join(self.location, 'codetree-collect-info.yaml')
+        if os.path.isfile(collect_info_path):
+            os.remove(collect_info_path)
+        result = self.source.get(self.location, self.source_options)
+        if result:
+            collect_info = self.collect_info(result)
+            if collect_info and os.path.isdir(self.location):
+                with open(collect_info_path, 'w') as f:
+                    f.write(six.ensure_text(yaml.dump(collect_info, default_flow_style=False)))
+        return result
 
     def __repr__(self):
         substs = {'class': self.__class__.__name__,
@@ -111,12 +159,12 @@
             if parent in self.tree:
                 self.tree[parent].append(child)
             elif os.path.isdir(parent):
-                logging.warn("Parent directory {} is not specified ".format(parent) +
-                             "in the configuration, using existing directory")
+                logging.warn("Parent directory {} is not specified "
+                             "in the configuration, using existing directory".format(parent))
                 self.tree[''].append(child)
             else:
-                raise InvalidDirective("Parent directory {} ".format(parent) +
-                                       "does not exist and is not in the configuration")
+                raise InvalidDirective("Parent directory {} "
+                                       "does not exist and is not in the configuration".format(parent))
             # Add my list of children
             self.tree[child] = []
 
@@ -193,7 +241,10 @@
                 workers = None
 
         if not workers:
-            workers = len(self.directive_map)
+            # Make sure there is at least one worker, even if our directive_map
+            # is empty, which can happen if the file contains comments or
+            # blank lines only.
+            workers = len(self.directive_map) or 1
 
         self.executor = concurrent.futures.ThreadPoolExecutor(
             max_workers=workers)
diff -Nru codetree-0.1.5/codetree/fileutils.py codetree-1.2.0/codetree/fileutils.py
--- codetree-0.1.5/codetree/fileutils.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/codetree/fileutils.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,3 +1,4 @@
+from __future__ import division, print_function
 import subprocess
 import shutil
 import os
diff -Nru codetree-0.1.5/codetree/handlers/basic.py codetree-1.2.0/codetree/handlers/basic.py
--- codetree-0.1.5/codetree/handlers/basic.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/codetree/handlers/basic.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,9 +1,11 @@
+from __future__ import division, print_function
+from io import open
 import logging
 import os
-from six.moves.urllib.request import urlopen
-from six.moves.urllib.error import URLError
 
 import codetree.fileutils as fileutils
+from ..six.moves.urllib.request import urlopen
+from ..six.moves.urllib.error import URLError
 
 
 class HandlerResult(object):
@@ -26,14 +28,27 @@
         if self.source is None or self.dest is None:
             return ""
 
-        line = "{}  {}".format(self.dest, self.source)
+        return "{}  {}".format(self.dest, self.collect_location)
+
+    @property
+    def collect_location(self):
+        if self.source is None or self.dest is None:
+            return ""
+
+        line = self.source
         options = self.options.copy()
 
         if self.revision is not None:
-            options["revno"] = self.revision
+            if line[:3] == "cs:":
+                # Charmstore URLs are in the form cs:nrpe-3
+                revision_info = "-{}".format(self.revision)
+                if not line.endswith(revision_info):
+                    line += revision_info
+            else:
+                options["revno"] = self.revision
 
         if len(options) > 0:
-            option_strings = ["{}={}".format(key, value) for key, value in options.items()]
+            option_strings = ["{}={}".format(key, value) for key, value in sorted(options.items())]
             line += ";" + ",".join(option_strings)
 
         return line
@@ -82,7 +97,7 @@
             logging.error("Failed to download {}: {}".format(self.source, e.reason))
             result.success = False
             return result
-        with open(dest, "w") as f:
+        with open(dest, "wb") as f:
             f.write(response.read())
         return result
 
diff -Nru codetree-0.1.5/codetree/handlers/bzr.py codetree-1.2.0/codetree/handlers/bzr.py
--- codetree-0.1.5/codetree/handlers/bzr.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/codetree/handlers/bzr.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,3 +1,5 @@
+from __future__ import division, print_function
+from io import open
 import logging
 import os
 import re
@@ -7,10 +9,10 @@
     CalledProcessError,
     check_call,
 )
-from six.moves.urllib.parse import urlparse
 
 from .basic import HandlerResult, SourceHandler
 from .exceptions import BranchDiverged, NotABranch
+from ..six.moves.urllib.parse import urlparse
 from .utils import log_failure, strip_trailing_slash
 
 
diff -Nru codetree-0.1.5/codetree/handlers/charm.py codetree-1.2.0/codetree/handlers/charm.py
--- codetree-0.1.5/codetree/handlers/charm.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/codetree/handlers/charm.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,3 +1,4 @@
+from __future__ import division, print_function
 import hashlib
 import json
 import logging
@@ -6,10 +7,14 @@
 import shutil
 import subprocess
 import tempfile
-from six.moves.urllib.parse import urlparse
+import sys
+from contextlib import closing
+from io import open
 
 from .basic import HandlerResult, SourceHandler
 from .exceptions import InvalidOption, NoSuchCharm
+from .. import six
+from ..six.moves.urllib.parse import urlparse
 
 
 SUPPORTED_CHANNELS = ('unpublished', 'edge', 'beta', 'candidate', 'stable')
@@ -51,13 +56,19 @@
             channels = ', '.join(SUPPORTED_CHANNELS)
             msg = 'Channel "{}" is invalid. Must be one of: {}.'.format(channel, channels)
             raise InvalidOption(msg)
+        if channel != "stable":
+            result.options["channel"] = channel
 
         if use_charm and _have_charm_tools():
             downloader = _CharmStoreCharmDownloader(self.source, channel)
         else:
             downloader = _CharmStoreHttpDownloader(self.source, self.base_url, channel)
-
         self.charmstore_url = downloader.resolve()
+        # Per https://github.com/juju/charm-tools/issues/337, we have to
+        # use specific revisions of charms.
+        downloader.source = self.charmstore_url
+        result.revision = self.charmstore_url.split("-")[-1]
+
         if os.path.exists(dest):
             if options.get("overwrite"):
                 # Remove the directory even if it was previously a bzr or git
@@ -72,7 +83,8 @@
                 # The version isn't up to date or is undetermined, if it isn't
                 # a git/bzr repo then remove and continue
                 if '.bzr' in os.listdir(dest) or '.git' in os.listdir(dest):
-                    logging.info('Skipping existing dest {} because it looks like a bzr or git branch'.format(dest))
+                    logging.error("Failed to update {} to {} because it looks like a bzr or git branch, and the "
+                                  "'overwrite' option wasn't set".format(dest, self.charmstore_url))
                     return result
                 shutil.rmtree(dest)
         if downloader.get(dest):
@@ -101,7 +113,7 @@
 
         path = os.path.join(dest, self.metadata_filename)
         with open(path, 'w') as metadata_file:
-            metadata_file.write(self._source_with_channel(self.charmstore_url, channel))
+            metadata_file.write(six.u(self._source_with_channel(self.charmstore_url, channel)))
 
     @staticmethod
     def _source_with_channel(url, channel):
@@ -120,7 +132,7 @@
         """
         meta_url = "{}/{}/meta/id?channel={}".format(self.base_url, self.source, self.channel)
         try:
-            self.charmstore_url = requests.get(meta_url).json()["Id"]
+            self.charmstore_url = requests.get(meta_url).json()["Id"][3:]
         except KeyError:
             raise NoSuchCharm('Could not find {!r} charm in the {!r} channel'.format(self.source, self.channel))
         return self.charmstore_url
@@ -131,7 +143,7 @@
             logging.info("Downloading {} from charm store to {}".format(self.raw_source, dest))
             zipped_path = self.cs_download(tmp_dir)
             # Note python zipfile doesn't properly handle symbolic links use unzip instead
-            subprocess.check_output(['unzip', zipped_path, '-d', dest], stderr=subprocess.STDOUT, universal_newlines=True)
+            subprocess.check_output(['unzip', '-o', zipped_path, '-d', dest], stderr=subprocess.STDOUT, universal_newlines=True)
             return True
         except Exception:
             raise
@@ -145,25 +157,23 @@
         :param download_dir: The directory to download to
         :return: The full path of the downloaded zip file
         """
-        # Remove 'cs:' to get expanded URL, which we actually want to use
-        # for the download
-        expanded_url = self.charmstore_url[3:]
-
         # Download (and verify SSL)
-        req = requests.get("{}/{}/archive".format(self.base_url, expanded_url))
+        url = "{0}/{1}/archive".format(self.base_url, self.charmstore_url)
         zip_path = os.path.join(download_dir, 'charm.zip')
-        with open(zip_path, 'wb') as charm_file:
+        calculated_hash = hashlib.new("sha384")
+        # Note that we need the `closing` wrapper for requests.get as it isn't
+        # a true context manager in python3.4. See LP#1884297.
+        with open(zip_path, 'wb') as charm_file, closing(requests.get(url)) as req:
             for chunk in req.iter_content(8192):
                 charm_file.write(chunk)
+                calculated_hash.update(six.ensure_binary(chunk))
+        calculated_sha = calculated_hash.hexdigest()
 
         # Verify SHA
         expected_sha = req.headers['Content-Sha384']
-        with open(zip_path, 'rb') as charm_file:
-            calculated_sha = hashlib.sha384(charm_file.read()).hexdigest()
-        if expected_sha != calculated_sha:
-            raise requests.HTTPError("SHA of downloaded charm {} didn't match " +
-                                     "expected SHA {}".format(calculated_sha,
-                                                              expected_sha))
+        if calculated_sha != expected_sha:
+            raise requests.HTTPError("SHA of downloaded charm {} didn't match "
+                                     "expected SHA {}".format(calculated_sha, expected_sha))
 
         return zip_path
 
@@ -176,8 +186,7 @@
     def resolve(self):
         """ Discover/confirm the full charmstore URL including revision
         """
-        cmd = ('charm', 'show', '--format=json', '--channel', self.channel, self.source, 'id')
-        out = subprocess.check_output(cmd, stderr=subprocess.STDOUT, universal_newlines=True)
+        out = run_charm_cmd('show', '--format=json', '--channel', self.channel, self.source, 'id')
         try:
             self.charmstore_url = json.loads(out)['id']['Id']
         except KeyError:
@@ -186,17 +195,31 @@
 
     def get(self, dest):
         logging.info("Downloading {} from charm store to {}".format(self.source, dest))
-        cmd = ('charm', 'pull', '--channel', self.channel, self.source, dest)
-        subprocess.check_output(cmd, stderr=subprocess.STDOUT, universal_newlines=True)
+        run_charm_cmd('pull', '--channel', self.channel, self.source, dest)
         return True
 
 
+class CharmClientError(Exception):
+    '''Raise when charm returns an error.'''
+
+
+def run_charm_cmd(*args):
+    cmd = ['charm']
+    cmd.extend(args)
+    try:
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, universal_newlines=True)
+    except subprocess.CalledProcessError as e:
+        if e.output:
+            raise CharmClientError(e.output)
+        raise
+
+
 def _have_charm_tools():
     """ _have_charm_tools checks that there is an appropriate version of charm installed
         which can be used to fetch the charm.
     """
     try:
-        subprocess.check_output(('charm', 'show', '--list'), stderr=subprocess.STDOUT)
-    except (subprocess.CalledProcessError, OSError):
+        run_charm_cmd('show', '--list')
+    except (CharmClientError, subprocess.CalledProcessError, OSError):
         return False
     return True
diff -Nru codetree-0.1.5/codetree/handlers/git.py codetree-1.2.0/codetree/handlers/git.py
--- codetree-0.1.5/codetree/handlers/git.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/codetree/handlers/git.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,15 +1,12 @@
+from __future__ import division, print_function
 import logging
 import os
-from six.moves.urllib.parse import urlparse
 import shutil
-from subprocess import (
-    check_output,
-    CalledProcessError,
-    STDOUT
-)
+from subprocess import check_call, check_output, CalledProcessError, STDOUT
 
 from .basic import HandlerResult, SourceHandler
 from .exceptions import NotABranch, NotSameBranch, InvalidOption
+from ..six.moves.urllib.parse import urlparse
 from .utils import log_failure
 
 
@@ -18,8 +15,10 @@
 
     schemes = (
         "git",
+        "git+file",
         "git+http",
         "git+https",
+        "git+lp",
         "git+ssh",
     )
 
@@ -29,6 +28,9 @@
         # strip git+ from the source
         if scheme in ("git+http", "git+https", "git+ssh"):
             self.source = source[4:]
+        elif scheme == "git+lp":
+            # git+lp:~owner/project/+git/branch => ssh://git.launchpad.net/~owner/project/+git/branch.
+            self.source = "ssh://git.launchpad.net/{}".format(source[7:])
         else:
             self.source = source
 
@@ -54,10 +56,14 @@
         except CalledProcessError:
             full_ref = ''
         if full_ref:
-            upstream_ref = check_output(self._git_cmd(dest, 'for-each-ref', '--format=%(upstream)', full_ref), universal_newlines=True).strip()
+            upstream_ref = check_output(
+                self._git_cmd(dest, 'for-each-ref', '--format=%(upstream)', full_ref), universal_newlines=True
+            ).strip()
             if upstream_ref:
-                if not log_failure(self._git_cmd(dest, 'merge', '--ff-only', upstream_ref),
-                                   "Updating repository at {} from {}".format(dest, upstream_ref)):
+                if not log_failure(
+                    self._git_cmd(dest, 'merge', '--ff-only', upstream_ref),
+                    "Updating repository at {} from {}".format(dest, upstream_ref),
+                ):
                     return False
 
         return True
@@ -79,17 +85,17 @@
         if os.path.exists(dest):
             if options.get("overwrite"):
                 shutil.rmtree(dest)
-                if not log_failure(clone_command,
-                                   "Cloning repository at {} from {}".format(dest, self.source)):
+                if not log_failure(clone_command, "Cloning repository at {} from {}".format(dest, self.source)):
                     return result
             else:
                 if not self.check_and_update(dest):
                     return result
-                if ref is None:  # default to master for the checkout of any updated repo
+
+                if ref is None and branch is None:  # default to master if ref or branch are None
+                    logging.info("revno and branch are not specified. Setting to 'master'.")
                     ref = 'master'
         else:
-            if not log_failure(clone_command,
-                               "Cloning repository at {} from {}".format(dest, self.source)):
+            if not log_failure(clone_command, "Cloning repository at {} from {}".format(dest, self.source)):
                 return result
 
         # Checkout the ref if one was specified
@@ -97,12 +103,21 @@
             if not log_failure(self._git_cmd(dest, 'checkout', ref), None):
                 return result
 
-        revision = check_output(self._git_cmd(dest, 'rev-parse', 'HEAD'), stderr=STDOUT, universal_newlines=True).strip()
+        revision = check_output(
+            self._git_cmd(dest, 'rev-parse', 'HEAD'), stderr=STDOUT, universal_newlines=True
+        ).strip()
         if ref is not None:
             logging.info("Repository {} at ref {} revision {}".format(dest, ref, revision))
         else:
             logging.info("Repository {} at revision {}".format(dest, revision))
 
+        # Update submodules
+        if not log_failure(
+            self._git_cmd(dest, 'submodule', 'update', '--init', '--recursive'),
+            'Updating submodules in repository {}'.format(dest),
+        ):
+            return result
+
         result.success = True
         result.revision = revision
         return result
diff -Nru codetree-0.1.5/codetree/handlers/utils.py codetree-1.2.0/codetree/handlers/utils.py
--- codetree-0.1.5/codetree/handlers/utils.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/codetree/handlers/utils.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,13 +1,13 @@
+from __future__ import division, print_function
 import logging
 from subprocess import (
     STDOUT,
     check_output,
     CalledProcessError
 )
-from six.moves.urllib.parse import urlparse
-
 from .basic import SourceHandler
 from .exceptions import CommandFailure, DuplicateHandlerError, NoSuchHandlerError
+from ..six.moves.urllib.parse import urlparse
 
 
 def handler_types(handler_class=None):
diff -Nru codetree-0.1.5/codetree/__init__.py codetree-1.2.0/codetree/__init__.py
--- codetree-0.1.5/codetree/__init__.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/codetree/__init__.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,3 +1,5 @@
+from __future__ import division, print_function
+from . import six
 from . import config
 from . import handlers
 from . import fileutils
diff -Nru codetree-0.1.5/codetree/six.py codetree-1.2.0/codetree/six.py
--- codetree-0.1.5/codetree/six.py	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/codetree/six.py	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,980 @@
+# Copyright (c) 2010-2020 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+from __future__ import absolute_import
+
+import functools
+import itertools
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.14.0"
+
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+PY34 = sys.version_info[0:2] >= (3, 4)
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+        del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result)  # Invokes __set__.
+        try:
+            # This is a bit ugly, but it avoids running this again by
+            # removing this descriptor.
+            delattr(obj.__class__, self.name)
+        except AttributeError:
+            pass
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+    def __getattr__(self, attr):
+        _module = self._resolve()
+        value = getattr(_module, attr)
+        setattr(self, attr, value)
+        return value
+
+
+class _LazyModule(types.ModuleType):
+
+    def __init__(self, name):
+        super(_LazyModule, self).__init__(name)
+        self.__doc__ = self.__class__.__doc__
+
+    def __dir__(self):
+        attrs = ["__doc__", "__name__"]
+        attrs += [attr.name for attr in self._moved_attributes]
+        return attrs
+
+    # Subclasses should override this
+    _moved_attributes = []
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+class _SixMetaPathImporter(object):
+
+    """
+    A meta path importer to import six.moves and its submodules.
+
+    This class implements a PEP302 finder and loader. It should be compatible
+    with Python 2.5 and all existing versions of Python3
+    """
+
+    def __init__(self, six_module_name):
+        self.name = six_module_name
+        self.known_modules = {}
+
+    def _add_module(self, mod, *fullnames):
+        for fullname in fullnames:
+            self.known_modules[self.name + "." + fullname] = mod
+
+    def _get_module(self, fullname):
+        return self.known_modules[self.name + "." + fullname]
+
+    def find_module(self, fullname, path=None):
+        if fullname in self.known_modules:
+            return self
+        return None
+
+    def __get_module(self, fullname):
+        try:
+            return self.known_modules[fullname]
+        except KeyError:
+            raise ImportError("This loader does not know module " + fullname)
+
+    def load_module(self, fullname):
+        try:
+            # in case of a reload
+            return sys.modules[fullname]
+        except KeyError:
+            pass
+        mod = self.__get_module(fullname)
+        if isinstance(mod, MovedModule):
+            mod = mod._resolve()
+        else:
+            mod.__loader__ = self
+        sys.modules[fullname] = mod
+        return mod
+
+    def is_package(self, fullname):
+        """
+        Return true, if the named module is a package.
+
+        We need this method to get correct spec objects with
+        Python 3.4 (see PEP451)
+        """
+        return hasattr(self.__get_module(fullname), "__path__")
+
+    def get_code(self, fullname):
+        """Return None
+
+        Required, if is_package is implemented"""
+        self.__get_module(fullname)  # eventually raises ImportError
+        return None
+    get_source = get_code  # same as get_code
+
+_importer = _SixMetaPathImporter(__name__)
+
+
+class _MovedItems(_LazyModule):
+
+    """Lazy loading of moved objects"""
+    __path__ = []  # mark as package
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("intern", "__builtin__", "sys"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
+    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
+    MovedAttribute("getoutput", "commands", "subprocess"),
+    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("UserDict", "UserDict", "collections"),
+    MovedAttribute("UserList", "UserList", "collections"),
+    MovedAttribute("UserString", "UserString", "collections"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("collections_abc", "collections", "collections.abc" if sys.version_info >= (3, 3) else "collections"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
+    MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"),
+    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread" if sys.version_info < (3, 9) else "_thread"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+    MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
+    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("_thread", "thread", "_thread"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
+    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
+    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
+    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
+]
+# Add windows specific modules.
+if sys.platform == "win32":
+    _moved_attributes += [
+        MovedModule("winreg", "_winreg"),
+    ]
+
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+    if isinstance(attr, MovedModule):
+        _importer._add_module(attr, "moves." + attr.name)
+del attr
+
+_MovedItems._moved_attributes = _moved_attributes
+
+moves = _MovedItems(__name__ + ".moves")
+_importer._add_module(moves, "moves")
+
+
+class Module_six_moves_urllib_parse(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_parse"""
+
+
+_urllib_parse_moved_attributes = [
+    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
+    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
+    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
+    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
+    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("quote", "urllib", "urllib.parse"),
+    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"),
+    MovedAttribute("urlencode", "urllib", "urllib.parse"),
+    MovedAttribute("splitquery", "urllib", "urllib.parse"),
+    MovedAttribute("splittag", "urllib", "urllib.parse"),
+    MovedAttribute("splituser", "urllib", "urllib.parse"),
+    MovedAttribute("splitvalue", "urllib", "urllib.parse"),
+    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
+]
+for attr in _urllib_parse_moved_attributes:
+    setattr(Module_six_moves_urllib_parse, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
+                      "moves.urllib_parse", "moves.urllib.parse")
+
+
+class Module_six_moves_urllib_error(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_error"""
+
+
+_urllib_error_moved_attributes = [
+    MovedAttribute("URLError", "urllib2", "urllib.error"),
+    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
+    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
+]
+for attr in _urllib_error_moved_attributes:
+    setattr(Module_six_moves_urllib_error, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
+                      "moves.urllib_error", "moves.urllib.error")
+
+
+class Module_six_moves_urllib_request(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_request"""
+
+
+_urllib_request_moved_attributes = [
+    MovedAttribute("urlopen", "urllib2", "urllib.request"),
+    MovedAttribute("install_opener", "urllib2", "urllib.request"),
+    MovedAttribute("build_opener", "urllib2", "urllib.request"),
+    MovedAttribute("pathname2url", "urllib", "urllib.request"),
+    MovedAttribute("url2pathname", "urllib", "urllib.request"),
+    MovedAttribute("getproxies", "urllib", "urllib.request"),
+    MovedAttribute("Request", "urllib2", "urllib.request"),
+    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
+    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
+    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
+    MovedAttribute("URLopener", "urllib", "urllib.request"),
+    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
+    MovedAttribute("parse_http_list", "urllib2", "urllib.request"),
+    MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"),
+]
+for attr in _urllib_request_moved_attributes:
+    setattr(Module_six_moves_urllib_request, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
+                      "moves.urllib_request", "moves.urllib.request")
+
+
+class Module_six_moves_urllib_response(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_response"""
+
+
+_urllib_response_moved_attributes = [
+    MovedAttribute("addbase", "urllib", "urllib.response"),
+    MovedAttribute("addclosehook", "urllib", "urllib.response"),
+    MovedAttribute("addinfo", "urllib", "urllib.response"),
+    MovedAttribute("addinfourl", "urllib", "urllib.response"),
+]
+for attr in _urllib_response_moved_attributes:
+    setattr(Module_six_moves_urllib_response, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
+                      "moves.urllib_response", "moves.urllib.response")
+
+
+class Module_six_moves_urllib_robotparser(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
+
+
+_urllib_robotparser_moved_attributes = [
+    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
+]
+for attr in _urllib_robotparser_moved_attributes:
+    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
+                      "moves.urllib_robotparser", "moves.urllib.robotparser")
+
+
+class Module_six_moves_urllib(types.ModuleType):
+
+    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
+    __path__ = []  # mark as package
+    parse = _importer._get_module("moves.urllib_parse")
+    error = _importer._get_module("moves.urllib_error")
+    request = _importer._get_module("moves.urllib_request")
+    response = _importer._get_module("moves.urllib_response")
+    robotparser = _importer._get_module("moves.urllib_robotparser")
+
+    def __dir__(self):
+        return ['parse', 'error', 'request', 'response', 'robotparser']
+
+_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
+                      "moves.urllib")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_closure = "__closure__"
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+    _func_globals = "__globals__"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_closure = "func_closure"
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+    _func_globals = "func_globals"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    create_bound_method = types.MethodType
+
+    def create_unbound_method(func, cls):
+        return func
+
+    Iterator = object
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    def create_bound_method(func, obj):
+        return types.MethodType(func, obj, obj.__class__)
+
+    def create_unbound_method(func, cls):
+        return types.MethodType(func, None, cls)
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
+
+
+if PY3:
+    def iterkeys(d, **kw):
+        return iter(d.keys(**kw))
+
+    def itervalues(d, **kw):
+        return iter(d.values(**kw))
+
+    def iteritems(d, **kw):
+        return iter(d.items(**kw))
+
+    def iterlists(d, **kw):
+        return iter(d.lists(**kw))
+
+    viewkeys = operator.methodcaller("keys")
+
+    viewvalues = operator.methodcaller("values")
+
+    viewitems = operator.methodcaller("items")
+else:
+    def iterkeys(d, **kw):
+        return d.iterkeys(**kw)
+
+    def itervalues(d, **kw):
+        return d.itervalues(**kw)
+
+    def iteritems(d, **kw):
+        return d.iteritems(**kw)
+
+    def iterlists(d, **kw):
+        return d.iterlists(**kw)
+
+    viewkeys = operator.methodcaller("viewkeys")
+
+    viewvalues = operator.methodcaller("viewvalues")
+
+    viewitems = operator.methodcaller("viewitems")
+
+_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
+_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
+_add_doc(iteritems,
+         "Return an iterator over the (key, value) pairs of a dictionary.")
+_add_doc(iterlists,
+         "Return an iterator over the (key, [values]) pairs of a dictionary.")
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+
+    def u(s):
+        return s
+    unichr = chr
+    import struct
+    int2byte = struct.Struct(">B").pack
+    del struct
+    byte2int = operator.itemgetter(0)
+    indexbytes = operator.getitem
+    iterbytes = iter
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+    del io
+    _assertCountEqual = "assertCountEqual"
+    if sys.version_info[1] <= 1:
+        _assertRaisesRegex = "assertRaisesRegexp"
+        _assertRegex = "assertRegexpMatches"
+        _assertNotRegex = "assertNotRegexpMatches"
+    else:
+        _assertRaisesRegex = "assertRaisesRegex"
+        _assertRegex = "assertRegex"
+        _assertNotRegex = "assertNotRegex"
+else:
+    def b(s):
+        return s
+    # Workaround for standalone backslash
+
+    def u(s):
+        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
+    unichr = unichr
+    int2byte = chr
+
+    def byte2int(bs):
+        return ord(bs[0])
+
+    def indexbytes(buf, i):
+        return ord(buf[i])
+    iterbytes = functools.partial(itertools.imap, ord)
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+    _assertCountEqual = "assertItemsEqual"
+    _assertRaisesRegex = "assertRaisesRegexp"
+    _assertRegex = "assertRegexpMatches"
+    _assertNotRegex = "assertNotRegexpMatches"
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+def assertCountEqual(self, *args, **kwargs):
+    return getattr(self, _assertCountEqual)(*args, **kwargs)
+
+
+def assertRaisesRegex(self, *args, **kwargs):
+    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
+
+
+def assertRegex(self, *args, **kwargs):
+    return getattr(self, _assertRegex)(*args, **kwargs)
+
+
+def assertNotRegex(self, *args, **kwargs):
+    return getattr(self, _assertNotRegex)(*args, **kwargs)
+
+
+if PY3:
+    exec_ = getattr(moves.builtins, "exec")
+
+    def reraise(tp, value, tb=None):
+        try:
+            if value is None:
+                value = tp()
+            if value.__traceback__ is not tb:
+                raise value.with_traceback(tb)
+            raise value
+        finally:
+            value = None
+            tb = None
+
+else:
+    def exec_(_code_, _globs_=None, _locs_=None):
+        """Execute code in a namespace."""
+        if _globs_ is None:
+            frame = sys._getframe(1)
+            _globs_ = frame.f_globals
+            if _locs_ is None:
+                _locs_ = frame.f_locals
+            del frame
+        elif _locs_ is None:
+            _locs_ = _globs_
+        exec("""exec _code_ in _globs_, _locs_""")
+
+    exec_("""def reraise(tp, value, tb=None):
+    try:
+        raise tp, value, tb
+    finally:
+        tb = None
+""")
+
+
+if sys.version_info[:2] > (3,):
+    exec_("""def raise_from(value, from_value):
+    try:
+        raise value from from_value
+    finally:
+        value = None
+""")
+else:
+    def raise_from(value, from_value):
+        raise value
+
+
+print_ = getattr(moves.builtins, "print", None)
+if print_ is None:
+    def print_(*args, **kwargs):
+        """The new-style print function for Python 2.4 and 2.5."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            # If the file has an encoding, encode unicode with it.
+            if (isinstance(fp, file) and
+                    isinstance(data, unicode) and
+                    fp.encoding is not None):
+                errors = getattr(fp, "errors", None)
+                if errors is None:
+                    errors = "strict"
+                data = data.encode(fp.encoding, errors)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+if sys.version_info[:2] < (3, 3):
+    _print = print_
+
+    def print_(*args, **kwargs):
+        fp = kwargs.get("file", sys.stdout)
+        flush = kwargs.pop("flush", False)
+        _print(*args, **kwargs)
+        if flush and fp is not None:
+            fp.flush()
+
+_add_doc(reraise, """Reraise an exception.""")
+
+if sys.version_info[0:2] < (3, 4):
+    # This does exactly the same what the :func:`py3:functools.update_wrapper`
+    # function does on Python versions after 3.2. It sets the ``__wrapped__``
+    # attribute on ``wrapper`` object and it doesn't raise an error if any of
+    # the attributes mentioned in ``assigned`` and ``updated`` are missing on
+    # ``wrapped`` object.
+    def _update_wrapper(wrapper, wrapped,
+                        assigned=functools.WRAPPER_ASSIGNMENTS,
+                        updated=functools.WRAPPER_UPDATES):
+        for attr in assigned:
+            try:
+                value = getattr(wrapped, attr)
+            except AttributeError:
+                continue
+            else:
+                setattr(wrapper, attr, value)
+        for attr in updated:
+            getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
+        wrapper.__wrapped__ = wrapped
+        return wrapper
+    _update_wrapper.__doc__ = functools.update_wrapper.__doc__
+
+    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
+              updated=functools.WRAPPER_UPDATES):
+        return functools.partial(_update_wrapper, wrapped=wrapped,
+                                 assigned=assigned, updated=updated)
+    wraps.__doc__ = functools.wraps.__doc__
+
+else:
+    wraps = functools.wraps
+
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(type):
+
+        def __new__(cls, name, this_bases, d):
+            if sys.version_info[:2] >= (3, 7):
+                # This version introduced PEP 560 that requires a bit
+                # of extra care (we mimic what is done by __build_class__).
+                resolved_bases = types.resolve_bases(bases)
+                if resolved_bases is not bases:
+                    d['__orig_bases__'] = bases
+            else:
+                resolved_bases = bases
+            return meta(name, resolved_bases, d)
+
+        @classmethod
+        def __prepare__(cls, name, this_bases):
+            return meta.__prepare__(name, bases)
+    return type.__new__(metaclass, 'temporary_class', (), {})
+
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        if hasattr(cls, '__qualname__'):
+            orig_vars['__qualname__'] = cls.__qualname__
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper
+
+
+def ensure_binary(s, encoding='utf-8', errors='strict'):
+    """Coerce **s** to six.binary_type.
+
+    For Python 2:
+      - `unicode` -> encoded to `str`
+      - `str` -> `str`
+
+    For Python 3:
+      - `str` -> encoded to `bytes`
+      - `bytes` -> `bytes`
+    """
+    if isinstance(s, text_type):
+        return s.encode(encoding, errors)
+    elif isinstance(s, binary_type):
+        return s
+    else:
+        raise TypeError("not expecting type '%s'" % type(s))
+
+
+def ensure_str(s, encoding='utf-8', errors='strict'):
+    """Coerce *s* to `str`.
+
+    For Python 2:
+      - `unicode` -> encoded to `str`
+      - `str` -> `str`
+
+    For Python 3:
+      - `str` -> `str`
+      - `bytes` -> decoded to `str`
+    """
+    if not isinstance(s, (text_type, binary_type)):
+        raise TypeError("not expecting type '%s'" % type(s))
+    if PY2 and isinstance(s, text_type):
+        s = s.encode(encoding, errors)
+    elif PY3 and isinstance(s, binary_type):
+        s = s.decode(encoding, errors)
+    return s
+
+
+def ensure_text(s, encoding='utf-8', errors='strict'):
+    """Coerce *s* to six.text_type.
+
+    For Python 2:
+      - `unicode` -> `unicode`
+      - `str` -> `unicode`
+
+    For Python 3:
+      - `str` -> `str`
+      - `bytes` -> decoded to `str`
+    """
+    if isinstance(s, binary_type):
+        return s.decode(encoding, errors)
+    elif isinstance(s, text_type):
+        return s
+    else:
+        raise TypeError("not expecting type '%s'" % type(s))
+
+
+def python_2_unicode_compatible(klass):
+    """
+    A class decorator that defines __unicode__ and __str__ methods under Python 2.
+    Under Python 3 it does nothing.
+
+    To support Python 2 and 3 with a single code base, define a __str__ method
+    returning text and apply this decorator to the class.
+    """
+    if PY2:
+        if '__str__' not in klass.__dict__:
+            raise ValueError("@python_2_unicode_compatible cannot be applied "
+                             "to %s because it doesn't define __str__()." %
+                             klass.__name__)
+        klass.__unicode__ = klass.__str__
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
+    return klass
+
+
+# Complete the moves implementation.
+# This code is at the end of this module to speed up module loading.
+# Turn this module into a package.
+__path__ = []  # required for PEP 302 and PEP 451
+__package__ = __name__  # see PEP 366 @ReservedAssignment
+if globals().get("__spec__") is not None:
+    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
+# Remove other six meta path importers, since they cause problems. This can
+# happen if six is removed from sys.modules and then reloaded. (Setuptools does
+# this for some reason.)
+if sys.meta_path:
+    for i, importer in enumerate(sys.meta_path):
+        # Here's some real nastiness: Another "instance" of the six module might
+        # be floating around. Therefore, we can't use isinstance() to check for
+        # the six meta path importer, since the other six instance will have
+        # inserted an importer with different class.
+        if (type(importer).__name__ == "_SixMetaPathImporter" and
+                importer.name == __name__):
+            del sys.meta_path[i]
+            break
+    del i, importer
+# Finally, add the importer to the meta path import hook.
+sys.meta_path.append(_importer)
Binary files /tmp/tmpy2q4rik3/Ra9SH_bcm2/codetree-0.1.5/.coverage and /tmp/tmpy2q4rik3/aZLuElWhKE/codetree-1.2.0/.coverage differ
diff -Nru codetree-0.1.5/debian/bzr-builder.manifest codetree-1.2.0/debian/bzr-builder.manifest
--- codetree-0.1.5/debian/bzr-builder.manifest	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/debian/bzr-builder.manifest	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,2 @@
+# bzr-builder format 0.3 deb-version {debupstream}-14~123
+lp:codetree revid:mergebot@juju-139df4-prod-is-toolbox-0.canonical.com-20210209090429-y4odnqasdh5of05e
diff -Nru codetree-0.1.5/debian/changelog codetree-1.2.0/debian/changelog
--- codetree-0.1.5/debian/changelog	2017-07-04 09:35:19.000000000 +0000
+++ codetree-1.2.0/debian/changelog	2021-02-09 09:16:56.000000000 +0000
@@ -1,3 +1,47 @@
+codetree (1.2.0-14~123~ubuntu16.04.1) xenial; urgency=low
+
+  * Auto build.
+
+ -- Launchpad Package Builder <noreply@launchpad.net>  Tue, 09 Feb 2021 09:16:56 +0000
+
+codetree (1.2.0-0) trusty; urgency=medium
+
+  * Drop python2 support
+
+ -- Stuart Bishop (Work) <stuart.bishop@canonical.com>  Wed, 10 Jun 2020 20:20:19 +1000
+
+codetree (1.1.1-0) trusty; urgency=medium
+
+  * Ensure git branches stick over multiple runs
+
+ -- Stuart Bishop (Work) <stuart.bishop@canonical.com>  Tue, 05 May 2020 16:20:38 +1000
+
+codetree (1.1.0-9) trusty; urgency=medium
+
+  * Automatically expand git submodules
+  * Switch to Python 3
+
+ -- Stuart Bishop (Work) <stuart.bishop@canonical.com>  Wed, 15 Apr 2020 16:02:18 +1000
+
+codetree (0.1.6-2) trusty; urgency=medium
+
+  * [mthaddon,r=hloeung] Be more explicit about errors with switching collect type without overwrite lp#1694876
+
+ -- Tom Haddon <tom.haddon@canonical.com>  Tue, 16 Jan 2018 09:59:42 +0200
+
+codetree (0.1.6-1) trusty; urgency=medium
+
+  * [mthaddon,r=axino] Remove existing codetree collect info file if it exists lp#1731898
+
+ -- Tom Haddon <tom.haddon@canonical.com>  Mon, 13 Nov 2017 14:46:20 +0000
+
+codetree (0.1.6) trusty; urgency=medium
+
+  * [hloeung,r=mthaddon] Pull specific charm revisions
+  * [mthaddon,r=stub] Create a codetree-collect-info.yaml file detailing when the code was downloaded and what constitutes it
+
+ -- Tom Haddon <tom.haddon@canonical.com>  Tue, 31 Oct 2017 09:23:43 +0000
+
 codetree (0.1.5-6) trusty; urgency=medium
 
   * [aluria,r=mthaddon] Limit on concurrent.futures.ThreadPoolExecutor threads can be specified
diff -Nru codetree-0.1.5/debian/control codetree-1.2.0/debian/control
--- codetree-0.1.5/debian/control	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/debian/control	2021-02-09 09:16:56.000000000 +0000
@@ -2,10 +2,18 @@
 Maintainer: Mojo Maintainers <mojo-maintainers@lists.canonical.com>
 Section: python
 Priority: optional
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7.4.3)
+Build-Depends: debhelper (>= 7.4.3), dh-python,
+ python3-setuptools, python3-all, python3-nose, python3-flake8, python3-mock,
+ git, rsync, unzip, bzr, python3-requests, python3-yaml,
 Standards-Version: 3.9.1
 
-Package: python-codetree
+# NB. This package contains the codetree executable, but is not called
+# 'codetree' because there is already an Ubuntu package with that name
+# for a different tool.
+Package: python3-codetree
+Provides: python-codetree (= 1.2.0-0)
+Replaces: python-codetree (<< 1.2.0-0)
+Breaks: python-codetree (<< 1.0)
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-bzrlib, python-requests, python-concurrent.futures, git, rsync, unzip, bzr
+Depends: ${misc:Depends}, ${python3:Depends}, python3-requests, python3-yaml, git, rsync, unzip, bzr
 Description: A code tree builder
diff -Nru codetree-0.1.5/debian/python3-codetree.install codetree-1.2.0/debian/python3-codetree.install
--- codetree-0.1.5/debian/python3-codetree.install	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/debian/python3-codetree.install	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,5 @@
+debian/usr/bin/codetree usr/bin/
+
+# Done here instead of python3-codetree.pyinstall because that wasn't
+# working under Trusty build.
+debian/usr/lib/python3/dist-packages/* usr/lib/python3/dist-packages
diff -Nru codetree-0.1.5/debian/python3-codetree.pyinstall codetree-1.2.0/debian/python3-codetree.pyinstall
--- codetree-0.1.5/debian/python3-codetree.pyinstall	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/debian/python3-codetree.pyinstall	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,5 @@
+# Done in python3-codetree.install instead of here because it
+# was failing under the Trusty build.
+#
+# codetree/*.py
+# codetree/handlers/*.py
diff -Nru codetree-0.1.5/debian/python-codetree.install codetree-1.2.0/debian/python-codetree.install
--- codetree-0.1.5/debian/python-codetree.install	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/debian/python-codetree.install	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,3 @@
+# Done here instead of python3-codetree.pyinstall because that wasn't
+# working under Trusty build.
+debian/usr/lib/python2.7/dist-packages/* usr/lib/python2.7/dist-packages
diff -Nru codetree-0.1.5/debian/python-codetree.pyinstall codetree-1.2.0/debian/python-codetree.pyinstall
--- codetree-0.1.5/debian/python-codetree.pyinstall	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/debian/python-codetree.pyinstall	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,2 @@
+#codetree/*.py
+#codetree/handlers/*.py
diff -Nru codetree-0.1.5/debian/rules codetree-1.2.0/debian/rules
--- codetree-0.1.5/debian/rules	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/debian/rules	2021-02-09 09:16:56.000000000 +0000
@@ -1,11 +1,20 @@
 #!/usr/bin/make -f
 
-# This file was automatically generated by stdeb 0.6.0+git at
-# Thu, 30 Jan 2014 14:46:21 -0300
-
+export DH_VERBOSE=1
+export LC_ALL=C
+ 
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
+	dh $@ --buildsystem=python_distutils --with=python3
+
+# override_dh_auto_test:
+# echo Tests disabled in package builds due to cross version problems
+
+override_dh_auto_clean:
+	python3 setup.py clean -a
+	rm -rf build
 
+override_dh_auto_build:
+	python3 setup.py build
 
-override_dh_builddeb:
-	dh_builddeb -- -Zgzip
+override_dh_auto_install:
+	python3 setup.py install --root=$(CURDIR)/debian/$(DEB_SOURCE) --install-layout=deb
diff -Nru codetree-0.1.5/.gitignore codetree-1.2.0/.gitignore
--- codetree-0.1.5/.gitignore	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-nosetests.xml
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-.idea
-
-# Vi
-.*.swp
diff -Nru codetree-0.1.5/Makefile codetree-1.2.0/Makefile
--- codetree-0.1.5/Makefile	2017-07-04 09:16:50.000000000 +0000
+++ codetree-1.2.0/Makefile	2021-02-09 09:16:56.000000000 +0000
@@ -1,8 +1,8 @@
 userinstall:
-	python setup.py install --user
+	python3 setup.py install --user
 
 install:
-	python setup.py install
+	python3 setup.py install
 
 clean:
 	rm -rf build codetree.egg-info dist
@@ -11,17 +11,17 @@
 # TODO: Ratchet complexity down to 10
 lint:
 	@echo "Checking Python syntax ..."
-	@flake8 --max-complexity=15 --ignore=E123,E501,F401,F403 $(PROJECT) && echo OK
+	@flake8 --max-complexity=15 --exclude=tests/test_data --exclude=six.py --ignore=E123,E501,F401,F403,C901 $(PROJECT) && echo OK
 
 test: lint
 	nosetests tests/
 	nosetests3 tests/
 
 dist:
-	bzr export --root=. ../codetree_$$(python setup.py --version).orig.tar.bz2 .
+	bzr export --root=. ../codetree_$$(python3 setup.py --version).orig.tar.bz2 .
 
 dch:
-	dch -D trusty --newversion $$(python setup.py -V)-1
+	dch -D trusty --newversion $$(python3 setup.py -V)-1
 
 deb: dist dch
 	cd debian && debuild -sa -I.bzr
diff -Nru codetree-0.1.5/MANIFEST.in codetree-1.2.0/MANIFEST.in
--- codetree-0.1.5/MANIFEST.in	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/MANIFEST.in	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,16 @@
+include LICENSE HACKING README.md
+include Makefile *.yaml *.txt *.ini
+recursive-include tests *.py
+recursive-include tests *.txt
+recursive-include tests *.zip
+recursive-include tests *.yaml
+recursive-include tests collect_1 collect_2 missing_parent simple_1 tricky_1
+# attempting to include these files breaks installation from source
+exclude tests/test_data/collect_info/empty_subdir/not-there.txt
+exclude tests/test_data/collect_info/.bogus-file-to-be-ignored
+recursive-exclude tests/test_data/collect_info recursive.txt recursive2.txt
+recursive-exclude tests not-there.txt
+exclude .gitconfig
+exclude .gitignore
+prune .bzr
+prune debian
diff -Nru codetree-0.1.5/README.md codetree-1.2.0/README.md
--- codetree-0.1.5/README.md	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/README.md	2021-02-09 09:16:56.000000000 +0000
@@ -25,6 +25,8 @@
     app/mytag               git://github.com/myapp;revno=mytag
     app2                    git+ssh://git@github.com/me/app2.git
     app3                    git+https://github.com/me/my3rdapp.git
+    app4                    git+lp:~owner/project/+git/branch
+    app5                    git+lp:~owner/project;revno=mytag
     mycharm                 cs:trusty/mycharm
     othercharm              cs:trusty/othercharm;channel=edge,overwrite=true
 
@@ -38,6 +40,8 @@
 * app/mytag is a git checkout of the git repository from github at the tag 'mytag'
 * app2 is also a git checkout but using a different format for the git url
 * app3 is another git checkout but using the https style git url understood by codetree
+* app4 is a git checkout from ssh://git.launchpad.net/~owner/project/+git/branch
+* app5 is a git checkout of the mytag branch from ssh://git.launchpad.net/~owner/project/+git/project (if the project and repository name match, Launchpad allows it to be shortened in this way).
 * mycharm is a Juju charm from the [charm store](https://jujucharms.com/)
 
 ### Source URLs
@@ -47,12 +51,12 @@
 * Bzr: bzr, bzr+ssh, lp, bzr+http, bzr+https
 * HTTP/S: http, https
 * Local: (empty scheme)
-* Git: git, git+ssh, git+http, git+https
+* Git: git, git+http, git+https, git+lp, git+ssh
 * Charm Store: cs
 
 If you're familiar with Bzr, you'll note that bzr+http and bzr+https are not valid schemes for Bzr URLs. No two handlers may handle the same scheme. In order to definitively identify the handler you want for a source, the scheme you use may be slightly non-standard.
 
-Similarly git+http and git+https are not valid schemas for git URLs, but are used in codetree for exactly the same reason.
+Similarly git+http, git+https and git+lp are not valid schemas for git URLs, but are used in codetree for exactly the same reason.
 
 Other handlers are planned, such as an archive handler (variant of the http/s handler).
 
diff -Nru codetree-0.1.5/setup.cfg codetree-1.2.0/setup.cfg
--- codetree-0.1.5/setup.cfg	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/setup.cfg	2021-02-09 09:16:56.000000000 +0000
@@ -1,3 +1,8 @@
+[build-system]
+requires = 
+    setuptools
+    wheel
+
 [nosetests]
 with-coverage=1
 cover-erase=1
diff -Nru codetree-0.1.5/setup.py codetree-1.2.0/setup.py
--- codetree-0.1.5/setup.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/setup.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,8 +1,25 @@
 from setuptools import setup, find_packages
+import sys
+
+tests_requires = [
+    "coverage>=4.4",
+    "nose>=1.3.7",
+    "pip>=9.0",
+    "requests>=2.18",
+    "setuptools>=36.0.1",
+    # "six>=1.10",  six now embedded as codetree.six
+    "flake8",
+]
+
+install_requires = [
+    'requests',
+    'pyyaml',
+    # 'six',  six now embedded as codetree.six
+]
 
 setup(
     name="python-codetree",
-    version="0.1.5",
+    version="1.2.0",
     description="A code tree builder",
     url="https://launchpad.net/codetree",
     packages=find_packages(exclude=['tests*']),
@@ -11,9 +28,11 @@
         "License :: OSI Approved :: MIT License",
         "Topic :: Internet",
         "Topic :: Software Development :: Libraries :: Python Modules",
-        "Intended Audience :: Developers"],
-    entry_points={
-        "console_scripts": ['codetree = codetree.cli:main']},
+        "Intended Audience :: Developers",
+    ],
+    entry_points={"console_scripts": ['codetree = codetree.cli:main']},
     include_package_data=False,
-    install_requires=['futures', 'requests', 'six']
+    install_requires=install_requires,
+    extras_require={"tests": tests_requires},
+    tests_require=tests_requires,
 )
diff -Nru codetree-0.1.5/snapcraft.yaml codetree-1.2.0/snapcraft.yaml
--- codetree-0.1.5/snapcraft.yaml	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/snapcraft.yaml	2021-02-09 09:16:56.000000000 +0000
@@ -1,14 +1,18 @@
 name: codetree
-version: 0.1.5
 summary: A tool for collating and building trees of files from various sources.
 description: A tool for collating and building trees of files from various sources.
 # Switch to strict once https://bugs.launchpad.net/snappy/+bug/1657021
 # is addressed.
+base: core20
 confinement: classic
+adopt-info: codetree
 grade: stable
 apps:
   codetree:
-    command: codetree
+    command: bin/python3 $SNAP/bin/codetree
+    environment:
+      PATH: $PATH:$SNAP/usr/bin
+      PYTHONPATH: $SNAP/lib/python3.8/site-packages
     # Classic mode has no plugs.
     # plugs:
     #   - home
@@ -17,10 +21,22 @@
 parts:
   codetree:
     plugin: python
-    python-version: python3
+    python-packages:
+      - pip
+      - setuptools
+      - wheel
     source: .
+    build-packages:
+      - bzr
     stage-packages:
-      - git
       - bzr
+      - git
+      - rsync
       - unzip
       - python3-paramiko
+      - python3-yaml
+    override-pull: |
+      snapcraftctl pull
+      CHANGELOG_VERSION=$(dpkg-parsechangelog --show-field Version)
+      BZR_REVNO=$(bzr revno)
+      snapcraftctl set-version "${CHANGELOG_VERSION}~${BZR_REVNO}"
diff -Nru codetree-0.1.5/test-requirements.txt codetree-1.2.0/test-requirements.txt
--- codetree-0.1.5/test-requirements.txt	2017-07-04 09:16:50.000000000 +0000
+++ codetree-1.2.0/test-requirements.txt	2021-02-09 09:16:56.000000000 +0000
@@ -8,5 +8,5 @@
 pip>=9.0
 requests>=2.18
 setuptools>=36.0.1
-six>=1.10
+# six>=1.10  six now embedded as codetree.six
 flake8>=2.2.4,<=2.4.1
diff -Nru codetree-0.1.5/tests/test_basic_handlers.py codetree-1.2.0/tests/test_basic_handlers.py
--- codetree-0.1.5/tests/test_basic_handlers.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/tests/test_basic_handlers.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,12 +1,5 @@
+from __future__ import division, print_function
 from unittest import TestCase
-from six.moves.urllib.parse import urlparse
-from six.moves.urllib.error import URLError
-from six import StringIO
-
-from mock import (
-    patch,
-    mock_open,
-)
 
 from codetree.handlers import (
     CommandFailure,
@@ -15,6 +8,16 @@
 )
 from codetree.handlers.basic import HandlerResult, SourceHandler
 from codetree.handlers.utils import log_failure, strip_trailing_slash
+from codetree import six
+from codetree.six.moves.urllib.parse import urlparse
+from codetree.six.moves.urllib.error import URLError
+from codetree.six import StringIO
+
+if six.PY2:
+    from mock import mock_open, patch
+else:
+    from unittest.mock import mock_open, patch
+
 
 HttpURLs = (
     "http://example.com/foo.txt",
@@ -59,12 +62,39 @@
         self.assertEqual("", str(hr))
 
         hr.dest = "dest"
-        hr.soure = "source"
         self.assertEqual("dest  source", str(hr))
 
         hr.revision = "12"
         self.assertEqual("dest  source;revno=12", str(hr))
 
+        hr.source = "cs:source"
+        self.assertEqual("dest  cs:source-12", str(hr))
+
+    def test_collect_location(self):
+        hr = HandlerResult(True)
+        hr.dest = "dest"
+        hr.source = "source"
+        self.assertEqual("source", hr.collect_location)
+
+        hr.revision = "12"
+        self.assertEqual("source;revno=12", hr.collect_location)
+
+        hr.source = "cs:source"
+        self.assertEqual("cs:source-12", hr.collect_location)
+
+        # If we manually specify a charmstore revision, confirm we don't
+        # append it twice to built_location.
+        hr.source = "cs:source-12"
+        self.assertEqual("cs:source-12", hr.collect_location)
+
+        hr.options = {"channel": "candidate"}
+        self.assertEqual("cs:source-12;channel=candidate", hr.collect_location)
+
+        hr.source = "source"
+        hr.options["overwrite"] = "true"
+        del hr.options["channel"]
+        self.assertEqual("source;overwrite=true,revno=12", hr.collect_location)
+
 
 class TestLogHandlers(TestCase):
     @patch("codetree.handlers.utils.check_output")
@@ -182,7 +212,7 @@
         with patch('codetree.handlers.basic.open', _open, create=True):
             self.assertTrue(hh.get(destfile, {}))
         self.assertFalse(_unlink.called)
-        _open.assert_called_with(destfile, "w")
+        _open.assert_called_with(destfile, "wb")
         _urlopen.assert_called_with(HttpURLs[0])
 
     @patch('codetree.handlers.basic.os.unlink')
@@ -218,7 +248,7 @@
         with patch('codetree.handlers.basic.open', _open, create=True):
             self.assertTrue(hh.get(destfile, options={"overwrite": True}))
         _unlink.assert_called_with(destfile)
-        _open.assert_called_with(destfile, "w")
+        _open.assert_called_with(destfile, "wb")
         _urlopen.assert_called_with(HttpURLs[0])
 
     @patch('codetree.handlers.basic.os.unlink')
diff -Nru codetree-0.1.5/tests/test_bzr_handler.py codetree-1.2.0/tests/test_bzr_handler.py
--- codetree-0.1.5/tests/test_bzr_handler.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/tests/test_bzr_handler.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,22 +1,24 @@
+from __future__ import division, print_function
 import os
 import shutil
 import subprocess
 from tempfile import mkdtemp
 from unittest import TestCase
+import six
 from six.moves.urllib.parse import urlparse
 from six import StringIO
 
-from mock import (
-    patch,
-    MagicMock,
-)
-
 from codetree.handlers import (
     BzrSourceHandler,
     NotSameBranch
 )
 from .test_basic_handlers import was_called_with_cmd
 
+if six.PY2:
+    from mock import MagicMock, patch
+else:
+    from unittest.mock import MagicMock, patch
+
 
 BzrURLs = (
     "bzr://example.com/foo/",
diff -Nru codetree-0.1.5/tests/test_charm_handler.py codetree-1.2.0/tests/test_charm_handler.py
--- codetree-0.1.5/tests/test_charm_handler.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/tests/test_charm_handler.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,49 +1,95 @@
-from mock import call, patch
+from __future__ import division, print_function
+from io import open
 import os
-from pkg_resources import resource_filename
 import requests
 import shutil
 import subprocess
 import tempfile
+import sys
 from unittest import TestCase
-from six.moves.urllib.parse import urlparse
 
 from codetree.handlers import charm
 from codetree.handlers import CharmStoreHandler
 from codetree.handlers.utils import handler_types
 from codetree.handlers.exceptions import InvalidOption
+from codetree import six
+from codetree.six.moves.urllib.parse import urlparse
+
+if six.PY2:
+    from mock import call, patch, MagicMock
+else:
+    from unittest.mock import call, patch, MagicMock
+
+
+TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class MockedReq(object):
     """ A class to mock out a request object without actually hitting the internet.
     """
 
-    def __init__(self, file_data=None, sha=None):
-
-        self.test_file = resource_filename("tests", "/test_data/charm.zip")
-        if file_data is None:
-            with open(self.test_file, 'rb') as test_zip:
-                self.file_data = test_zip.read()
+    def __init__(
+        self,
+        file_data=None,
+        sha="5a1481850e29647059f21f8bf23f082649d3f5a9808481fe122db41f7a827765025da5e17da9e9ae522140113b2f1804",
+        url=None
+    ):
+
+        self.test_file = os.path.join(TEST_DIR, "test_data", "charm.zip")
+        self.headers = {"Content-Sha384": sha}
+        self.url = url if url else "file://{0}".format(self.test_file)
+        self.raw = None
+        self.status_code = None
+        self.encoding = None
+        if file_data is not None:
+            self._content = file_data
         else:
-            self.file_data = file_data
-        if sha is None:
-            self._headers = {'Content-Sha384':
-                             '5a1481850e29647059f21f8bf23f082649d3f5a9808481fe122db41f7a827765025da5e17da9e9ae522140113b2f1804'}
-        else:
-            self._headers = {'Content-Sha384': sha}
+            self._content = six.BytesIO()
+            with open(self.test_file, 'rb') as test_zip:
+                shutil.copyfileobj(test_zip, self._content)
+            self._content.seek(0)
 
-    @property
-    def headers(self):
-        return self._headers
+    def __iter__(self):
+        return self.iter_content(128)
+
+    def __enter__(self):
+        return self
 
-    def iter_content(self, size=None):
-        yield self.file_data
-        raise StopIteration
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        pass
+
+    def close(self):
+        pass
+
+    @property
+    def content(self):
+        if isinstance(self._content, six.BytesIO):
+            return self._content.getvalue()
+        return self._content
+
+    def iter_content(self, size=1):
+        if isinstance(self._content, six.BytesIO):
+            self._content.seek(0)
+            for chunk in iter(lambda: self._content.read(size), b""):
+                yield chunk
+        else:
+            str_pos = 0
+            while str_pos < len(self._content):
+                yield self._content[str_pos:min(str_pos + size, len(self._content))]
+                str_pos += size
 
     def json(self):
         return {'Id': 'cs:trusty/charm'}
 
 
+def mocked_get(*args, **kwargs):
+    file_data = kwargs.pop("file_data", None)
+    sha = kwargs.pop("sha", "5a1481850e29647059f21f8bf23f082649d3f5a9808481fe122db41f7a827765025da5e17da9e9ae522140113b2f1804")
+    url = kwargs.pop("url", None)
+    kwargs.pop("raw", False)
+    return MockedReq(file_data=file_data, sha=sha, url=url)
+
+
 class TestCharmStoreHandler(TestCase):
     def setUp(self):
         charm._have_charm_tools = lambda: False
@@ -62,7 +108,7 @@
         for url in urls:
             self.assertIn(urlparse(url).scheme, CharmStoreHandler.schemes)
 
-        assert 'cs' in handler_types().keys()
+        assert 'cs' in list(handler_types().keys())
 
     def test_metadata(self):
         dest = os.path.join(self.tdir, 'test_download')
@@ -74,11 +120,12 @@
         self.cs._set_url(dest)
         self.assertEqual('cs:trusty/test-auditd-1;channel=stable', self.cs._get_url(dest))
 
+    @patch("codetree.handlers.charm.logging.error")
     @patch("codetree.handlers.charm.logging.info")
     @patch("codetree.handlers.charm.requests.get")
-    def test_download(self, _get, _logging):
+    def test_download(self, _get, _logging_info, _logging_error):
         dest = os.path.join(self.tdir, 'test_download')
-        _get.return_value = MockedReq()
+        _get.return_value = mocked_get()
 
         assert self.cs.get(dest, {})
         assert _get.call_count == 2
@@ -87,9 +134,9 @@
         assert _get.call_args_list == expected_request_args
         expected_logging = [call("Downloading {} from charm store to {}".format(self.cs.source, dest)),
                             call("{} charm retrieved from {}".format(dest, self.cs.charmstore_url))]
-        self.assertEqual(_logging.call_args_list, expected_logging)
+        self.assertEqual(_logging_info.call_args_list, expected_logging)
         _get.reset_mock()
-        _logging.reset_mock()
+        _logging_info.reset_mock()
 
         # check only, no update needed
         assert self.cs.get(dest, {})
@@ -97,9 +144,9 @@
         expected_request_args = [call('{}/trusty/charm/meta/id?channel=stable'.format(self.cs.base_url))]
         assert _get.call_args_list == expected_request_args
         expected_logging = [call("{} is up to date from url {}, skipping.".format(dest, self.cs.charmstore_url))]
-        assert _logging.call_args_list == expected_logging
+        assert _logging_info.call_args_list == expected_logging
         _get.reset_mock()
-        _logging.reset_mock()
+        _logging_info.reset_mock()
 
         # Edit the metadata forcing a re-download
         self.cs.charmstore_url += 'test'
@@ -111,37 +158,40 @@
         assert _get.call_args_list == expected_request_args
         expected_logging = [call("Downloading {} from charm store to {}".format(self.cs.source, dest)),
                             call("{} charm retrieved from {}".format(dest, self.cs.charmstore_url))]
-        assert _logging.call_args_list == expected_logging
+        assert _logging_info.call_args_list == expected_logging
         _get.reset_mock()
-        _logging.reset_mock()
+        _logging_info.reset_mock()
 
-        # trick it into thinking it's a git repo, get should do nothing and log
+        # Trick it into thinking it's a git repo, `get()` should refuse to
+        # update and log an error.
         os.remove(os.path.join(dest, self.cs.metadata_filename))
         with open(os.path.join(dest, '.git'), 'w') as git:
-            git.write('This is a git repo')
+            git.write(six.u('This is a git repo'))
+        # Confirm we return False which will be considered an error.
         self.assertFalse(self.cs.get(dest, {}))
         self.assertEqual(_get.call_count, 1)
         expected_request_args = [call('{}/trusty/charm/meta/id?channel=stable'.format(self.cs.base_url))]
         assert _get.call_args_list == expected_request_args
-        expected_logging = [call("Skipping existing dest {} because it looks like a bzr or git branch".format(dest))]
-        assert _logging.call_args_list == expected_logging
+        expected_logging = [call("Failed to update {} to {} because it looks like a bzr or git branch, and the "
+                                 "'overwrite' option wasn't set".format(dest, self.cs.charmstore_url))]
+        assert _logging_error.call_args_list == expected_logging
 
     @patch("codetree.handlers.charm.logging.info")
     @patch("codetree.handlers.charm.requests.get")
     def test_download_with_overwrite(self, _get, _logging):
         dest = os.path.join(self.tdir, 'test_overwrite')
-        _get.return_value = MockedReq()
+        _get.return_value = mocked_get()
 
         assert self.cs.get(dest, {'overwrite': True})
         _get.assert_called_with(self.get_url)
         expected_logging = [call("Downloading {} from charm store to {}".format(self.cs.source, dest)),
-                            call("{} charm retrieved from cs:trusty/charm".format(dest))]
+                            call("{} charm retrieved from trusty/charm".format(dest))]
         self.assertEqual(_logging.call_args_list, expected_logging)
         _logging.reset_mock()
 
         # Now let's trick it into thinking it's a git repo
         with open(os.path.join(dest, '.git'), 'w') as git:
-            git.write('This is a git repo')
+            git.write(six.u('This is a git repo'))
 
         # Second run should overwrite (redownload) even though it's a git branch
         assert self.cs.get(dest, {'overwrite': True})
@@ -155,7 +205,7 @@
     @patch("codetree.handlers.charm.requests.get")
     def test_download_from_channel(self, _get, _logging):
         dest = os.path.join(self.tdir, 'test_download')
-        _get.return_value = MockedReq()
+        _get.return_value = mocked_get()
 
         assert self.cs.get(dest, {'channel': 'edge'})
         assert _get.call_count == 2
@@ -176,7 +226,7 @@
     @patch("codetree.handlers.charm.requests.get")
     def test_failed_sha(self, _get):
         dest = os.path.join(self.tdir, 'test_failed_sha')
-        _get.return_value = MockedReq(sha='toosmallforasha')
+        _get.return_value = mocked_get(sha='toosmallforasha')
 
         with self.assertRaises(requests.HTTPError):
             self.cs.get(dest, {})
@@ -186,7 +236,8 @@
         dest = os.path.join(self.tdir, 'test_invalid_zip')
 
         test_sha = '0291dbcaaa51039c59ae631f106d95791fb8c74815fee44f3f31fea7f9f30d001e24d038e90ed632d1d71a6f4082ad5c'
-        _get.return_value = MockedReq(file_data=b'not a valid zip', sha=test_sha)
+        mock_file_data = six.BytesIO(six.ensure_binary("not a valid zip"))
+        _get.return_value = mocked_get(file_data=mock_file_data, sha=test_sha)
 
         with self.assertRaises(subprocess.CalledProcessError):
             self.cs.get(dest, {})
@@ -217,9 +268,26 @@
         assert self.cs.get(dest, {})
         assert _check_output.call_count == 2
         expected_request_args = [
-            call(('charm', 'show', '--format=json', '--channel', 'stable', 'cs:trusty/charm', 'id'), stderr=subprocess.STDOUT, universal_newlines=True),
-            call(('charm', 'pull', '--channel', 'stable', 'cs:trusty/charm', dest), stderr=subprocess.STDOUT, universal_newlines=True)]
-        assert _check_output.call_args_list == expected_request_args
-        expected_logging = [call("Downloading {} from charm store to {}".format(self.cs.source, dest)),
+            call(['charm', 'show', '--format=json', '--channel', 'stable', 'cs:trusty/charm', 'id'], stderr=subprocess.STDOUT, universal_newlines=True),
+            call(['charm', 'pull', '--channel', 'stable', 'cs:trusty/charm-10', dest], stderr=subprocess.STDOUT, universal_newlines=True)]
+        self.assertEqual(_check_output.call_args_list, expected_request_args)
+        expected_logging = [call("Downloading cs:trusty/charm-10 from charm store to {}".format(dest)),
                             call("{} charm retrieved from {}".format(dest, self.cs.charmstore_url))]
         self.assertEqual(_logging.call_args_list, expected_logging)
+
+    @patch("codetree.handlers.charm.logging.info")
+    @patch("codetree.handlers.charm.subprocess.check_output")
+    def test_charm_error(self, _check_output, _logging):
+        dest = os.path.join(self.tdir, 'test_download')
+
+        def simulate_charm(cmd, *args, **kwargs):
+            if cmd[1] == 'show':
+                return '{"id": {"Id": "cs:trusty/charm-10"}}'
+            elif cmd[1] == 'pull':
+                raise subprocess.CalledProcessError(1, cmd, 'test error output')
+
+        _check_output.side_effect = simulate_charm
+
+        with self.assertRaises(charm.CharmClientError) as context:
+            self.cs.get(dest, {})
+        self.assertEqual(str(context.exception), 'test error output')
diff -Nru codetree-0.1.5/tests/test_config.py codetree-1.2.0/tests/test_config.py
--- codetree-0.1.5/tests/test_config.py	2017-07-04 09:16:50.000000000 +0000
+++ codetree-1.2.0/tests/test_config.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,12 +1,19 @@
-from collections import OrderedDict
-import mock
+from __future__ import division, print_function
 import os
+import sys
+from collections import OrderedDict
 from pkg_resources import resource_filename
 from textwrap import dedent
 from unittest import TestCase
 
-from codetree.config import Config, ConfigResults, InvalidDirective
+from codetree.config import Config, ConfigResults, Directive, InvalidDirective
 from codetree.handlers.basic import HandlerResult
+from codetree import six
+
+if six.PY2:
+    import mock
+else:
+    from unittest import mock
 
 
 class TestConfig(TestCase):
@@ -108,7 +115,7 @@
         os.mkdir('dir')
         with mock.patch('logging.warn') as mock_log:
             conf = Config(test_filename)
-            mock_log.assert_called_once_with("Parent directory dir is not specified " +
+            mock_log.assert_called_once_with("Parent directory dir is not specified "
                                              "in the configuration, using existing directory")
             assert 'dir/subdir' in conf.tree['']
 
@@ -228,6 +235,37 @@
         self._concurrent_config_build_test(config_name)
         self._concurrent_config_build_test(config_name, 2)
 
+    def test_directive_collect_info(self):
+        # This will be used for the result object
+        class Object(object):
+            pass
+
+        d = Directive()
+
+        # If it's a directory, return an empty dict
+        result = Object()
+        result.collect_location = '@'
+        self.assertEqual(d.collect_info(result), {})
+
+        # If it's a valid location, check our collect_info
+        result.collect_location = 'cs:nrpe-33'
+        result.dest = 'tests/test_data/collect_info'
+        collect_info = d.collect_info(result)
+        self.assertEqual(collect_info["collect_url"], 'cs:nrpe-33')
+        expected_hashes = {
+            'file-with-content.txt': '12e5f06f48001f1a4e017906478f3bd4b8084770a3453da7dca8b8c86dacb973',
+            'non_empty_subdir/some_real_content.txt':
+                'a79ddd2fdef1bc71bb67139399804f3633d0fbd6e431e29f50b0bb9cde61cc8a',  # noqa
+            'some_real_content.txt': 'a79ddd2fdef1bc71bb67139399804f3633d0fbd6e431e29f50b0bb9cde61cc8a',
+            }
+        self.assertEqual(collect_info["hashes"], expected_hashes)
+
+    def test_empty_collect_file(self):
+        # Test that an empty collect file (or a file with comments only)
+        # is handled correctly and doesn't throw an error due to 0 workers.
+        collect_config = Config('tests/test_data/comments_only')
+        self.assertEqual(collect_config.build(), [])
+
 
 class TestConfigResults(TestCase):
     def test_true(self):
@@ -262,6 +300,6 @@
         expected = dedent("""\
                     my-charm  git+ssh://git.launchpad.net/~my-team/my-project/+git/my-repo;revno=243e6594eff4cc3e903b299ec8c74b0d8aa617e2
                     nrpe  cs:nrpe
-                    ntp  lp:charms/trusty/ntp;revno=27,overwrite=true
+                    ntp  lp:charms/trusty/ntp;overwrite=true,revno=27
                     """)
         self.assertEqual(expected, cr.generate_config())
diff -Nru codetree-0.1.5/tests/test_data/collect_info/.bogus-file-to-be-ignored codetree-1.2.0/tests/test_data/collect_info/.bogus-file-to-be-ignored
--- codetree-0.1.5/tests/test_data/collect_info/.bogus-file-to-be-ignored	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/tests/test_data/collect_info/.bogus-file-to-be-ignored	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,2 @@
+This file should not be included in the list of files we generate sha256sums
+for.
diff -Nru codetree-0.1.5/tests/test_data/collect_info/codetree-collect-info.yaml codetree-1.2.0/tests/test_data/collect_info/codetree-collect-info.yaml
--- codetree-0.1.5/tests/test_data/collect_info/codetree-collect-info.yaml	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/tests/test_data/collect_info/codetree-collect-info.yaml	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1,2 @@
+This file should not be included in the list of files we generate sha256sums
+for.
diff -Nru codetree-0.1.5/tests/test_data/collect_info/file-with-content.txt codetree-1.2.0/tests/test_data/collect_info/file-with-content.txt
--- codetree-0.1.5/tests/test_data/collect_info/file-with-content.txt	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/tests/test_data/collect_info/file-with-content.txt	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1 @@
+This file has some content
diff -Nru codetree-0.1.5/tests/test_data/collect_info/non_empty_subdir/some_real_content.txt codetree-1.2.0/tests/test_data/collect_info/non_empty_subdir/some_real_content.txt
--- codetree-0.1.5/tests/test_data/collect_info/non_empty_subdir/some_real_content.txt	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/tests/test_data/collect_info/non_empty_subdir/some_real_content.txt	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1 @@
+Some real content
diff -Nru codetree-0.1.5/tests/test_data/collect_info/some_real_content.txt codetree-1.2.0/tests/test_data/collect_info/some_real_content.txt
--- codetree-0.1.5/tests/test_data/collect_info/some_real_content.txt	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/tests/test_data/collect_info/some_real_content.txt	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1 @@
+Some real content
diff -Nru codetree-0.1.5/tests/test_data/comments_only codetree-1.2.0/tests/test_data/comments_only
--- codetree-0.1.5/tests/test_data/comments_only	1970-01-01 00:00:00.000000000 +0000
+++ codetree-1.2.0/tests/test_data/comments_only	2021-02-09 09:16:56.000000000 +0000
@@ -0,0 +1 @@
+# This file includes comments only
diff -Nru codetree-0.1.5/tests/test_git_handler.py codetree-1.2.0/tests/test_git_handler.py
--- codetree-0.1.5/tests/test_git_handler.py	2017-07-04 09:16:41.000000000 +0000
+++ codetree-1.2.0/tests/test_git_handler.py	2021-02-09 09:16:56.000000000 +0000
@@ -1,9 +1,10 @@
+from __future__ import division, print_function
+from io import open
 import os
 import shutil
 import subprocess
 from tempfile import mkdtemp
 from unittest import TestCase
-from six.moves.urllib.parse import urlparse
 
 from codetree.handlers import (
     GitSourceHandler,
@@ -11,6 +12,8 @@
     NotSameBranch,
     InvalidOption
 )
+from codetree.six.moves.urllib.parse import urlparse
+from codetree import six
 
 
 class TestGitSourceHandler(TestCase):
@@ -18,90 +21,100 @@
         self._gitdir = mkdtemp('', 'git')
         subprocess.check_call(('git', '-C', self._gitdir, 'init', '-q'))
         with open(os.path.join(self._gitdir, 'file'), 'w') as f:
-            f.write('tag A')
+            f.write(six.u('tag A'))
         subprocess.check_call(('git', '-C', self._gitdir, 'add', 'file'))
         subprocess.check_call(('git', '-C', self._gitdir, 'commit', '-q', '-m', 'tag A'))
         subprocess.check_call(('git', '-C', self._gitdir, 'tag', '-a', '-m', 'A', 'A'))
         subprocess.check_call(('git', '-C', self._gitdir, 'checkout', '-q', '-b', 'branch-B'))
         with open(os.path.join(self._gitdir, 'file'), 'w') as f:
-            f.write('branch B')
+            f.write(six.u('branch B'))
         subprocess.check_call(('git', '-C', self._gitdir, 'commit', '-q', '-a', '-m', 'branch B'))
 
         # Do an orphan checkout here to test the behaviour of the --single-branch behaviour.
         subprocess.check_call(('git', '-C', self._gitdir, 'checkout', '--orphan', 'branch-single'))
-        subprocess.check_call(('git', '-C', self._gitdir, 'rm', '-rf', ''))
+        subprocess.check_call(('git', '-C', self._gitdir, 'rm', '-rf', '.'))
         with open(os.path.join(self._gitdir, 'file'), 'w') as f:
-            f.write('single branch')
+            f.write(six.u('single branch'))
         subprocess.check_call(('git', '-C', self._gitdir, 'add', 'file'))
         subprocess.check_call(('git', '-C', self._gitdir, 'commit', '-q', '-m', 'tag single branch'))
 
         subprocess.check_call(('git', '-C', self._gitdir, 'checkout', '-q', 'master'))
         with open(os.path.join(self._gitdir, 'file'), 'w') as f:
-            f.write('revision')
+            f.write(six.u('revision'))
         subprocess.check_call(('git', '-C', self._gitdir, 'commit', '-q', '-a', '-m', 'revision'))
         self._revision = subprocess.check_output(('git', '-C', self._gitdir, 'rev-parse', 'HEAD')).strip()
         with open(os.path.join(self._gitdir, 'file'), 'w') as f:
-            f.write('HEAD')
+            f.write(six.u('HEAD'))
         subprocess.check_call(('git', '-C', self._gitdir, 'commit', '-q', '-a', '-m', 'HEAD'))
-        self._pid = subprocess.Popen(
-            ('git', '-C', self._gitdir, 'daemon', '--reuseaddr', '--export-all', '--base-path={}'.format(self._gitdir)))
+
+    @property
+    def git_resource_prefix(self):
+        return "file://{}".format(os.path.abspath(self._gitdir))
 
     def tearDown(self):
-        self._pid.terminate()
-        self._pid.wait()
         shutil.rmtree(self._gitdir)
 
     def test_url_handling(self):
         urls = (
-            'git://github.com/juju/juju',
-            'git+ssh://git@github.com:juju/juju',
-            'git+http://github.com/juju/juju',
-            'git+https://github.com/juju/juju',
+            ('git://github.com/juju/juju', 'git://github.com/juju/juju'),
+            ('git+http://github.com/juju/juju', 'http://github.com/juju/juju'),
+            ('git+https://github.com/juju/juju', 'https://github.com/juju/juju'),
+            ('git+lp:~owner/project/+git/branch', 'ssh://git.launchpad.net/~owner/project/+git/branch'),
+            ('git+ssh://git@github.com:juju/juju', 'ssh://git@github.com:juju/juju'),
         )
-        for url in urls:
-            self.assertIn(urlparse(url).scheme, GitSourceHandler.schemes)
+        for (input_url, resolved_url) in urls:
+            self.assertIn(urlparse(input_url).scheme, GitSourceHandler.schemes)
+            githandler = GitSourceHandler(input_url)
+            self.assertEqual(githandler.source, resolved_url)
 
     def test_get_no_options(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {})
-            with open(os.path.join(wd, 'file')) as f:
-                c = f.read()
-                self.assertEqual('HEAD', c)
+            with open(os.path.join(wd, 'file'), "r") as f:
+                c = f.read().strip()
+            self.assertEqual('HEAD', c)
         finally:
             shutil.rmtree(d)
 
     def test_get_tag(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {'revno': 'A'})
-            with open(os.path.join(wd, 'file')) as f:
-                c = f.read()
-                self.assertEqual('tag A', c)
+            with open(os.path.join(wd, 'file'), "r") as f:
+                c = f.read().strip()
+            self.assertEqual('tag A', c)
         finally:
             shutil.rmtree(d)
 
     def test_get_branch(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
-            gh.get(wd, {'revno': 'branch-B'})
-            with open(os.path.join(wd, 'file')) as f:
-                c = f.read()
-                self.assertEqual('branch B', c)
+            wd = os.path.join(d, 'test')
+            ret = gh.get(wd, {'branch': 'branch-B'})
+            self.assertTrue(ret.success)
+            with open(os.path.join(wd, 'file'), "r") as f:
+                c = f.read().strip()
+            self.assertEqual('branch B', c)
+            # Get with branch another time to validate the idempotency
+            ret = gh.get(wd, {'branch': 'branch-B'})
+            self.assertTrue(ret.success)
+            with open(os.path.join(wd, 'file'), "r") as f:
+                c = f.read().strip()
+            self.assertEqual('branch B', c)
         finally:
             shutil.rmtree(d)
 
     def test_get_revision(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {'revno': self._revision})
             rev = subprocess.check_output(gh._git_cmd(wd, 'rev-parse', 'HEAD'))
             self.assertEqual(self._revision, rev.strip())
@@ -109,10 +122,10 @@
             shutil.rmtree(d)
 
     def test_get_revision_depth_1(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {'revno': self._revision, 'depth': 1})
             rev_count = subprocess.check_output(gh._git_cmd(wd, 'rev-list', '--count', '--all'), universal_newlines=True)
             self.assertEqual('1', rev_count.strip())
@@ -120,10 +133,10 @@
             shutil.rmtree(d)
 
     def test_get_revision_depth_1_str(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {'revno': self._revision, 'depth': "1"})
             rev_count = subprocess.check_output(gh._git_cmd(wd, 'rev-list', '--count', '--all'), universal_newlines=True)
             self.assertEqual('1', rev_count.strip())
@@ -131,42 +144,42 @@
             shutil.rmtree(d)
 
     def test_get_revision_depth_is_int(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             with self.assertRaises(ValueError):
                 gh.get(wd, {'revno': self._revision, 'depth': "invalid"})
         finally:
             shutil.rmtree(d)
 
     def test_get_specific_branch(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {'branch': 'branch-B'})
-            with open(os.path.join(wd, 'file')) as f:
-                c = f.read()
-                self.assertEqual('branch B', c)
+            with open(os.path.join(wd, 'file'), "r") as f:
+                c = f.read().strip()
+            self.assertEqual('branch B', c)
         finally:
             shutil.rmtree(d)
 
     def test_get_branch_and_revno(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             with self.assertRaises(InvalidOption):
                 gh.get(wd, {'revno': self._revision, 'branch': 'branch-B'})
         finally:
             shutil.rmtree(d)
 
     def test_get_branch_with_depth(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {'branch': 'branch-B', 'depth': '1'})
             with open(os.path.join(wd, 'file')) as f:
                 c = f.read()
@@ -177,10 +190,10 @@
             shutil.rmtree(d)
 
     def test_get_single_branch(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {'branch': 'branch-single'})
             with open(os.path.join(wd, 'file')) as f:
                 c = f.read()
@@ -191,26 +204,26 @@
             shutil.rmtree(d)
 
     def test_directory_exists(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
-        os.mkdir(wd)
         try:
+            wd = os.path.join(d, 'test')
+            os.mkdir(wd)
             with self.assertRaises(NotABranch):
                 gh.get(wd, {})
         finally:
             shutil.rmtree(d)
 
     def test_directory_exists_with_same_origin(self):
-        gh = GitSourceHandler("git://localhost/.git")
-        d = mkdtemp('', 'git-handler')
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         olddir = os.getcwd()
+        d = mkdtemp('', 'git-handler')
         try:
             wd = os.path.join(d, 'test')
             os.mkdir(wd)
             os.chdir(wd)
             subprocess.check_call(('git', 'init', '-q'))
-            subprocess.check_call(('git', 'remote', 'add', 'origin', 'git://localhost/.git'))
+            subprocess.check_call(('git', 'remote', 'add', 'origin', '{}/.git'.format(self.git_resource_prefix)))
             os.chdir(olddir)
             gh.get(wd, {})
             with open(os.path.join(wd, 'file')) as f:
@@ -221,9 +234,9 @@
             shutil.rmtree(d)
 
     def test_directory_exists_with_different_origin(self):
-        gh = GitSourceHandler("git://localhost/.git")
-        d = mkdtemp('', 'git-handler')
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         olddir = os.getcwd()
+        d = mkdtemp('', 'git-handler')
         try:
             wd = os.path.join(d, 'test')
             os.mkdir(wd)
@@ -238,9 +251,9 @@
             shutil.rmtree(d)
 
     def test_overwrite(self):
-        gh = GitSourceHandler("git://localhost/.git")
-        d = mkdtemp('', 'git-handler')
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         olddir = os.getcwd()
+        d = mkdtemp('', 'git-handler')
         try:
             wd = os.path.join(d, 'test')
             os.mkdir(wd)
@@ -249,28 +262,28 @@
             subprocess.check_call(('git', 'remote', 'add', 'origin', 'git://notlocalhost/.git'))
             os.chdir(olddir)
             gh.get(wd, {"overwrite": True})
-            with open(os.path.join(wd, 'file')) as f:
-                c = f.read()
-                self.assertEqual('HEAD', c)
+            with open(os.path.join(wd, 'file'), "r") as f:
+                c = f.read().strip()
+            self.assertEqual('HEAD', c)
         finally:
             os.chdir(olddir)
             shutil.rmtree(d)
 
     def test_new_commit(self):
-        gh = GitSourceHandler("git://localhost/.git")
+        gh = GitSourceHandler("{}/.git".format(self.git_resource_prefix))
         d = mkdtemp('', 'git-handler')
-        wd = os.path.join(d, 'test')
         try:
+            wd = os.path.join(d, 'test')
             gh.get(wd, {})
-            with open(os.path.join(wd, 'file')) as f:
-                c = f.read()
-                self.assertEqual('HEAD', c)
+            with open(os.path.join(wd, 'file'), "r") as f:
+                c = f.read().strip()
+            self.assertEqual('HEAD', c)
             with open(os.path.join(self._gitdir, 'file'), 'w') as f:
-                f.write('modified')
+                f.write(six.u('modified'))
             subprocess.check_call(('git', '-C', self._gitdir, 'commit', '-q', '-a', '-m', 'modified'), universal_newlines=True)
             gh.get(wd, {})
-            with open(os.path.join(wd, 'file')) as f:
-                c = f.read()
-                self.assertEqual('modified', c)
+            with open(os.path.join(wd, 'file'), "r") as f:
+                c = f.read().strip()
+            self.assertEqual('modified', c)
         finally:
             shutil.rmtree(d)