Merge lp:~maxb/bzr-builddeb/mend-indent into lp:bzr-builddeb

[Max Bowsher]

Mend inconsistencies where different indent widths are used at different points
within a single Python source file. I've not attempted to produce consistency
across the project, just ensure each file is internally consistent.

[James Westby (james-w)]

review: Approve

=== modified file 'import_dsc.py'
--- import_dsc.py	2011-06-03 06:35:14 +0000
+++ import_dsc.py	2011-06-04 09:06:02 +0000
@@ -40,7 +40,7 @@
     from debian import deb822
     from debian.changelog import Version, Changelog, VersionError
 except ImportError:
-  # Prior to 0.1.15 the debian module was called debian_bundle
+    # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle import deb822
     from debian_bundle.changelog import Version, Changelog, VersionError
 
@@ -91,46 +91,46 @@
 
 class DscCache(object):
 
-  def __init__(self, transport=None):
-    self.cache = {}
-    self.transport_cache = {}
-    self.transport = transport
-
-  def get_dsc(self, name):
-
-    if name in self.cache:
-      dsc1 = self.cache[name]
-    else:
-      # Obtain the dsc file, following any redirects as needed.
-      filename, transport = open_transport(name)
-      f1 = open_file_via_transport(filename, transport)
-      try:
-        dsc1 = deb822.Dsc(f1)
-      finally:
-        f1.close()
-      self.cache[name] = dsc1
-      self.transport_cache[name] = transport
-
-    return dsc1
-
-  def get_transport(self, name):
-    return self.transport_cache[name]
+    def __init__(self, transport=None):
+        self.cache = {}
+        self.transport_cache = {}
+        self.transport = transport
+
+    def get_dsc(self, name):
+
+        if name in self.cache:
+            dsc1 = self.cache[name]
+        else:
+            # Obtain the dsc file, following any redirects as needed.
+            filename, transport = open_transport(name)
+            f1 = open_file_via_transport(filename, transport)
+            try:
+                dsc1 = deb822.Dsc(f1)
+            finally:
+                f1.close()
+            self.cache[name] = dsc1
+            self.transport_cache[name] = transport
+
+        return dsc1
+
+    def get_transport(self, name):
+        return self.transport_cache[name]
 
 class DscComp(object):
 
-  def __init__(self, cache):
-    self.cache = cache
+    def __init__(self, cache):
+        self.cache = cache
 
-  def cmp(self, dscname1, dscname2):
-    dsc1 = self.cache.get_dsc(dscname1)
-    dsc2 = self.cache.get_dsc(dscname2)
-    v1 = Version(dsc1['Version'])
-    v2 = Version(dsc2['Version'])
-    if v1 == v2:
-      return 0
-    if v1 > v2:
-      return 1
-    return -1
+    def cmp(self, dscname1, dscname2):
+        dsc1 = self.cache.get_dsc(dscname1)
+        dsc2 = self.cache.get_dsc(dscname2)
+        v1 = Version(dsc1['Version'])
+        v2 = Version(dsc2['Version'])
+        if v1 == v2:
+            return 0
+        if v1 > v2:
+            return 1
+        return -1
 
 
 

=== modified file 'tests/blackbox/test_import_dsc.py'
--- tests/blackbox/test_import_dsc.py	2011-05-04 15:06:45 +0000
+++ tests/blackbox/test_import_dsc.py	2011-06-04 09:06:02 +0000
@@ -32,11 +32,11 @@
 class TestBaseImportDsc(BuilddebTestCase):
 
   def _upstream_dir(self, package_name, upstream_version):
-      return package_name + '-' + upstream_version
+    return package_name + '-' + upstream_version
   upstream_dir = property(lambda self:self._upstream_dir(self.package_name,
       self.upstream_version))
   def _upstream_tarball_name(self, package_name, upstream_version):
-      return package_name + '_' + upstream_version + '.orig.tar.gz'
+    return package_name + '_' + upstream_version + '.orig.tar.gz'
   upstream_tarball_name = property(lambda self:
       self._upstream_tarball_name(self.package_name, self.upstream_version))
   dsc_name = property(lambda self:
@@ -119,5 +119,4 @@
         'package.'], 'import-dsc')
 
 
-# vim: ts=4 sts=4 sw=4
-
+# vim: ts=2 sts=2 sw=2

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2011-01-29 00:13:30 +0000
+++ tests/test_import_dsc.py	2011-06-04 09:06:02 +0000
@@ -32,8 +32,8 @@
     from debian_bundle import deb822
 
 from bzrlib import (
-  tests,
-  )
+        tests,
+        )
 
 from bzrlib.plugins.builddeb.import_dsc import (
         DistributionBranch,
@@ -51,22 +51,22 @@
 
 class _PristineTarFeature(tests.Feature):
 
-  def feature_name(self):
-    return '/usr/bin/pristine-tar'
+    def feature_name(self):
+        return '/usr/bin/pristine-tar'
 
-  def _probe(self):
-    return os.path.exists("/usr/bin/pristine-tar")
+    def _probe(self):
+        return os.path.exists("/usr/bin/pristine-tar")
 
 
 PristineTarFeature = _PristineTarFeature()
 
 
 def write_to_file(filename, contents):
-  f = open(filename, 'wb')
-  try:
-    f.write(contents)
-  finally:
-    f.close()
+    f = open(filename, 'wb')
+    try:
+        f.write(contents)
+    finally:
+        f.close()
 
 
 class DistributionBranchTests(BuilddebTestCase):

=== modified file 'tests/test_merge_upstream.py'
--- tests/test_merge_upstream.py	2011-02-03 22:45:27 +0000
+++ tests/test_merge_upstream.py	2011-06-04 09:06:02 +0000
@@ -34,25 +34,25 @@
 
 class TestPackageVersion(TestCase):
 
-  def test_simple_debian(self):
-    self.assertEquals(Version("1.2-1"),
-        package_version("1.2", "debian"))
-
-  def test_simple_ubuntu(self):
-    self.assertEquals(Version("1.2-0ubuntu1"),
-        package_version("1.2", "ubuntu"))
-
-  def test_debian_with_dash(self):
-    self.assertEquals(Version("1.2-0ubuntu1-1"),
-        package_version("1.2-0ubuntu1", "debian"))
-
-  def test_ubuntu_with_dash(self):
-    self.assertEquals(Version("1.2-1-0ubuntu1"),
-        package_version("1.2-1", "ubuntu"))
-
-  def test_ubuntu_with_epoch(self):
-    self.assertEquals(Version("3:1.2-1-0ubuntu1"),
-        package_version("1.2-1", "ubuntu", "3"))
+    def test_simple_debian(self):
+        self.assertEquals(Version("1.2-1"),
+                package_version("1.2", "debian"))
+
+    def test_simple_ubuntu(self):
+        self.assertEquals(Version("1.2-0ubuntu1"),
+                package_version("1.2", "ubuntu"))
+
+    def test_debian_with_dash(self):
+        self.assertEquals(Version("1.2-0ubuntu1-1"),
+                package_version("1.2-0ubuntu1", "debian"))
+
+    def test_ubuntu_with_dash(self):
+        self.assertEquals(Version("1.2-1-0ubuntu1"),
+                package_version("1.2-1", "ubuntu"))
+
+    def test_ubuntu_with_epoch(self):
+        self.assertEquals(Version("3:1.2-1-0ubuntu1"),
+                package_version("1.2-1", "ubuntu", "3"))
 
 
 class UpstreamMergeChangelogLineTests(TestCase):

=== modified file 'util.py'
--- util.py	2011-04-08 18:47:10 +0000
+++ util.py	2011-06-04 09:06:02 +0000
@@ -345,23 +345,23 @@
 
 
 def open_transport(path):
-  """Obtain an appropriate transport instance for the given path."""
-  base_dir, path = urlutils.split(path)
-  transport = get_transport(base_dir)
-  return (path, transport)
+    """Obtain an appropriate transport instance for the given path."""
+    base_dir, path = urlutils.split(path)
+    transport = get_transport(base_dir)
+    return (path, transport)
 
 
 def open_file_via_transport(filename, transport):
-  """Open a file using the transport, follow redirects as necessary."""
-  def open_file(transport):
-    return transport.get(filename)
-  def follow_redirection(transport, e, redirection_notice):
-    mutter(redirection_notice)
-    _filename, redirected_transport = open_transport(e.target)
-    return redirected_transport
+    """Open a file using the transport, follow redirects as necessary."""
+    def open_file(transport):
+        return transport.get(filename)
+    def follow_redirection(transport, e, redirection_notice):
+        mutter(redirection_notice)
+        _filename, redirected_transport = open_transport(e.target)
+        return redirected_transport
 
-  result = do_catching_redirections(open_file, transport, follow_redirection)
-  return result
+    result = do_catching_redirections(open_file, transport, follow_redirection)
+    return result
 
 
 def _dget(cls, dsc_location, target_dir):