Merge lp:~jelmer/bzr-builddeb/version-bytestrings into lp:bzr-builddeb

[Jelmer Vernooij]

Use upstream version strings as byte strings everywhere, properly convert unicode tags to byte strings.

[lp:~jelmer/bzr-builddeb/version-bytestrings]

522. By Jelmer Vernooij on 2011-02-20

Force upstream version to byte string.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-02-11 14:29:07 +0000
+++ cmds.py	2011-02-20 23:57:35 +0000
@@ -323,7 +323,7 @@
                         upstream_revision = upstream_branch.last_revision()
                     else:
                         upstream_revision = upstream_source.version_as_revision(
-                            version)
+                            None, version.upstream_version.encode("utf-8"))
                 finally:
                     upstream_branch.unlock()
         return (upstream_branch, upstream_revision)
@@ -708,6 +708,7 @@
                     package, current_version)
             if version is None:
                 raise BzrCommandError("You must specify the version number using --version.")
+            assert isinstance(version, str)
             note("Using version string %s." % (version))
             # Look up the revision id from the version string
             if upstream_revision is None and upstream_branch_source is not None:
 
=== modified file 'import_dsc.py'
--- import_dsc.py	2011-02-11 14:29:07 +0000
+++ import_dsc.py	2011-02-20 23:57:35 +0000
@@ -1385,8 +1385,8 @@
             upstream_tip = self.pristine_tar_source.version_as_revision(
                     package, previous_version)
             self.extract_upstream_tree(upstream_tip, tempdir)
-        elif upstream_branch is not None:
-            upstream_tip = self.upstream_branch_source.version_as_revision(package, previous_version)
+        elif self.upstream_source is not None:
+            upstream_tip = self.upstream_source.version_as_revision(package, previous_version)
             self.extract_upstream_tree(upstream_tip, tempdir)
         else:
             raise BzrCommandError("Unable to find the tag for the "
 
=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-02-11 14:21:19 +0000
+++ tests/test_upstream.py	2011-02-20 23:57:35 +0000
@@ -387,7 +387,7 @@
       """Last revision is tagged - use as upstream version."""
       self.revhistory = ["somerevid"]
       self.assertEquals(Version("1.3"),
-          _upstream_branch_version(self.revhistory, {"somerevid": ["1.3"]}, "bla", "1.2", self.get_suffix))
+          _upstream_branch_version(self.revhistory, {"somerevid": [u"1.3"]}, "bla", "1.2", self.get_suffix))
 
     def test_refresh_snapshot_pre(self):
       self.revhistory = ["oldrevid", "somerevid"]
@@ -403,25 +403,28 @@
       self.revhistory = ["oldrevid", "somerevid", "newrevid"]
       self.assertEquals(Version("1.3+bzr3"),
             _upstream_branch_version(self.revhistory,
-                {"somerevid": ["1.3"]}, "bla", "1.2+bzr1", self.get_suffix))
+                {"somerevid": [u"1.3"]}, "bla", "1.2+bzr1", self.get_suffix))
 
 
 class TestUpstreamTagToVersion(TestCase):
 
     def test_prefix(self):
-        self.assertEquals(Version("5.0"), upstream_tag_to_version("release-5.0"))
+        self.assertEquals(Version("5.0"), upstream_tag_to_version(u"release-5.0"))
 
     def test_gibberish(self):
-        self.assertIs(None, upstream_tag_to_version("blabla"))
+        self.assertIs(None, upstream_tag_to_version(u"blabla"))
 
     def test_vprefix(self):
-        self.assertEquals(Version("2.0"), upstream_tag_to_version("v2.0"))
+        self.assertEquals("2.0", upstream_tag_to_version(u"v2.0"))
 
     def test_plain(self):
-        self.assertEquals(Version("2.0"), upstream_tag_to_version("2.0"))
+        self.assertEquals("2.0", upstream_tag_to_version(u"2.0"))
 
     def test_package_prefix(self):
-        self.assertEquals(Version("42.0"), upstream_tag_to_version("bla-42.0", "bla"))
+        self.assertEquals("42.0", upstream_tag_to_version(u"bla-42.0", "bla"))
+
+    def test_unicode(self):
+        self.assertEquals("42.0\xc2\xa9", upstream_tag_to_version("bla-42.0\xc2\xa9".decode("utf-8"), "bla"))
 
 
 class TestUpstreamVersionAddRevision(TestCaseWithTransport):
 
=== modified file 'upstream/branch.py'
--- upstream/branch.py	2011-01-29 01:03:18 +0000
+++ upstream/branch.py	2011-02-20 23:57:35 +0000
@@ -33,16 +33,17 @@
 
 def upstream_tag_to_version(tag_name, package=None):
     """Take a tag name and return the upstream version, or None."""
+    assert isinstance(tag_name, unicode)
     if (package is not None and (
           tag_name.startswith("%s-" % package) or
           tag_name.startswith("%s_" % package))):
-        return tag_name[len(package)+1:]
+        return tag_name[len(package)+1:].encode("utf-8")
     if tag_name.startswith("release-"):
-        return tag_name[len("release-"):]
+        return tag_name[len("release-"):].encode("utf-8")
     if tag_name[0] == "v" and tag_name[1].isdigit():
-        return tag_name[1:]
+        return tag_name[1:].encode("utf-8")
     if all([c.isdigit() or c in (".", "~") for c in tag_name]):
-        return tag_name
+        return tag_name.encode("utf-8")
     return None
 
 
@@ -227,6 +228,7 @@
             self.upstream_revision_map = upstream_revision_map
 
     def version_as_revision(self, package, version):
+        assert isinstance(version, str)
         if version in self.upstream_revision_map:
              return self.upstream_revision_map[version]
         revspec = get_export_upstream_revision(self.config,