Merge lp:~garyvdm/apt-zeroconf/pep8-fixes into lp:apt-zeroconf

[Gary van der Merwe]

When I run the test suite, I get some failures in the test_sourcecode. This branch fixes these.

Unmerged revisions

129. By Gary van der Merwe on 2011-06-17

PEP 8 fixes.

=== modified file 'aptzeroconf/http.py'
--- aptzeroconf/http.py	2009-09-12 02:04:35 +0000
+++ aptzeroconf/http.py	2011-06-17 13:59:03 +0000
@@ -145,7 +145,7 @@
     @trap_socketerror
     def do_GET(self):
         self._do_GET()
-    
+
     def _do_GET(self):
         """
         Respond to a GET request by proxy the url to preferably local content,

=== modified file 'aptzeroconf/parse.py'
--- aptzeroconf/parse.py	2009-08-09 02:39:51 +0000
+++ aptzeroconf/parse.py	2011-06-17 13:59:03 +0000
@@ -28,14 +28,16 @@
 
 V2, V3 = 0.2, 0.3
 EPOCH_PATTERN = {
-    V2 : re.compile(r'\_\d+\%3a'),
-    V3 : re.compile(r'\_\d+\:')
+    V2: re.compile(r'\_\d+\%3a'),
+    V3: re.compile(r'\_\d+\:'),
 }
 
+
 def normalize_whitespace(text):
     """Remove excessive whitespace in spaces."""
     return ' '.join(text.split())
 
+
 def _is_equal(pkg, find, ver):
     """Are the packages equal disregarding the epoch?"""
     return EPOCH_PATTERN[ver].sub('_', pkg) == find or pkg == find

=== modified file 'test/test_general.py'
--- test/test_general.py	2009-08-09 03:57:29 +0000
+++ test/test_general.py	2011-06-17 13:59:03 +0000
@@ -126,7 +126,8 @@
 
 def test_download_epoch_local_server(tmpdir):
     """
-    Test fetching a file with an epoch from an AZC instance on the local network.
+    Test fetching a file with an epoch from an AZC instance on the local
+    network.
     """
     # cachedir is the directory to serve debs out of
     one = path.join(str(tmpdir), 'one')