pull-pkg: use ubuntutools/version/Version

instead of debian.debian_support.Version, use ubuntutools version,
which extends it and adds the strip_epoch() function which is
needed to convert full version string to version used in filenames

pull-debian-debdiff

@@ -20,17 +20,17 @@
 import optparse
 import sys
 
-import debian.debian_support
 import debian.changelog
 
 from ubuntutools.archive import DebianSourcePackage, DownloadError
 from ubuntutools.config import UDTConfig
 from ubuntutools.logger import Logger
+from ubuntutools.version import Version
 
 
 def previous_version(package, version, distance):
     "Given an (extracted) package, determine the version distance versions ago"
-    upver = debian.debian_support.Version(version).upstream_version
+    upver = Version(version).upstream_version
     filename = '%s-%s/debian/changelog' % (package, upver)
     changelog_file = open(filename, 'r')
     changelog = debian.changelog.Changelog(changelog_file.read())

requestsync

@@ -30,13 +30,13 @@ import optparse
 import os
 import sys
 
-from debian.changelog import Version
 from distro_info import UbuntuDistroInfo
 
 from ubuntutools.config import UDTConfig, ubu_email
 from ubuntutools.lp import udtexceptions
 from ubuntutools.misc import require_utf8
 from ubuntutools.question import confirmation_prompt, EditBugReport
+from ubuntutools.version import Version
 
 #
 # entry point

ubuntutools/archive.py

@@ -42,15 +42,15 @@ except ImportError:
 import re
 import sys
 
-from debian.changelog import Changelog, Version
+from debian.changelog import Changelog
 import debian.deb822
-import debian.debian_support
 import httplib2
 
 from ubuntutools.config import UDTConfig
 from ubuntutools.lp.lpapicache import (Launchpad, Distribution,
                                        SourcePackagePublishingHistory)
 from ubuntutools.logger import Logger
+from ubuntutools.version import Version
 from ubuntutools import subprocess
 
 if sys.version_info[0] >= 3:
@@ -160,7 +160,7 @@ class SourcePackage(object):
             if version is None:
                 version = 'unknown'
 
-        self.version = debian.debian_support.Version(version)
+        self.version = Version(version)
 
         # uses default proxies from the environment
         proxy = ProxyHandler()
@@ -194,10 +194,7 @@ class SourcePackage(object):
     @property
     def dsc_name(self):
         "Return the source package dsc filename for the given package"
-        version = self.version.upstream_version
-        if self.version.debian_version:
-            version += '-' + self.version.debian_version
-        return '%s_%s.dsc' % (self.source, version)
+        return '%s_%s.dsc' % (self.source, self.version.strip_epoch())
 
     @property
     def dsc_pathname(self):
@@ -271,7 +268,7 @@ class SourcePackage(object):
         "Check that the dsc matches what we are expecting"
         assert self._dsc is not None
         self.source = self.dsc['Source']
-        self.version = debian.debian_support.Version(self.dsc['Version'])
+        self.version = Version(self.dsc['Version'])
 
         valid = False
         message = None

ubuntutools/lp/lpapicache.py

@@ -30,12 +30,13 @@ from __future__ import print_function
 import collections
 import sys
 
-from debian.changelog import Changelog, Version
+from debian.changelog import Changelog
 from httplib2 import Http, HttpLib2Error
 from launchpadlib.launchpad import Launchpad as LP
 from launchpadlib.errors import HTTPError
 from lazr.restfulclient.resource import Entry
 
+from ubuntutools.version import Version
 from ubuntutools.lp import (service, api_version)
 from ubuntutools.lp.udtexceptions import (AlreadyLoggedInError,
                                           ArchiveNotFoundException,

ubuntutools/requestsync/mail.py

@@ -29,13 +29,14 @@ import smtplib
 import socket
 import tempfile
 
-from debian.changelog import Changelog, Version
+from debian.changelog import Changelog
 from distro_info import DebianDistroInfo, DistroDataOutdated
 
 from ubuntutools.archive import rmadison, FakeSPPH
 from ubuntutools.lp.udtexceptions import PackageNotFoundException
 from ubuntutools.logger import Logger
 from ubuntutools.question import confirmation_prompt, YesNoQuestion
+from ubuntutools.version import Version
 from ubuntutools import subprocess
 
 if sys.version_info[0] >= 3:

ubuntutools/sponsor_patch/bugtask.py

@@ -23,11 +23,11 @@ try:
 except ImportError:
     from urllib import unquote, urlretrieve
 
-import debian.debian_support
 import distro_info
 import httplib2
 
 from ubuntutools.logger import Logger
+from ubuntutools.version import Version
 
 
 def is_sync(bug):
@@ -152,7 +152,7 @@ class BugTask(object):
 
     def get_version(self):
         source_package_version = self.get_source().source_package_version
-        return debian.debian_support.Version(source_package_version)
+        return Version(source_package_version)
 
     def get_latest_released_version(self):
         source = self.get_source(True)
@@ -160,7 +160,7 @@ class BugTask(object):
             version = '~'
         else:
             version = source.source_package_version
-        return debian.debian_support.Version(version)
+        return Version(version)
 
     def get_debian_source_series(self):
         title = self.bug_task.bug.title.lower().split()

ubuntutools/test/example_package.py

@@ -18,13 +18,13 @@ import os.path
 import shutil
 import subprocess
 
-import debian.debian_support
+from ubuntutools.version import Version
 
 
 class ExamplePackage(object):
     def __init__(self, source='example', version='1.0-1'):
         self.source = source
-        self.version = debian.debian_support.Version(version)
+        self.version = Version(version)
         self.srcdir = os.path.join('test-data', '%s-%s' % (source,
                                    self.version.upstream_version))
         if os.path.exists(self.srcdir):