* apt/*.py:

  - Almost complete cleanup of the code
  - Remove inconsistent use of tabs and spaces (Closes: #505443)
  - Improved documentation
* apt/debfile.py:
  - Drop get*() methods, as they are deprecated and were
    never in a stable release
  - Make DscSrcPackage working
* apt/gtk/widgets.py:
  - Fix the code and document the signals
* Introduce new documentation build with Sphinx
  - Contains style Guide (Closes: #481562)
  - debian/rules: Build the documentation here
  - setup.py: Remove pydoc building and add new docs.
  - debian/examples: Include examples from documentation
  - debian/python-apt.docs:
    + Change html/ to build/doc/html.
    + Add build/doc/text for the text-only documentation
* setup.py:
  - Only create build/data when building, not all the time
  - Remove build/mo and build/data on clean -a
* debian/control:
  - Remove the Conflicts on python2.3-apt, python2.4-apt, as
    they are only needed for oldstable (sarge)
  - Build-Depend on python-sphinx (>= 0.5)
* aptsources/distinfo.py:
  - Allow @ in mirror urls (Closes: #478171) (LP: #223097)
* Merge Ben Finney's whitespace changes (Closes: #481563)
* Merge Ben Finney's do not use has_key() (Closes: #481878)
* Do not use deprecated form of raise statement (Closes: #494259)
* Add support for PkgRecords.SHA256Hash (Closes: #456113)

1 files changed, 31 insertions, 28 deletions

diff --git a/doc/examples/versiontest.py b/doc/examples/versiontest.py
index 95f887f2..fa13cc1c 100755
--- a/doc/examples/versiontest.py
+++ b/doc/examples/versiontest.py
@@ -1,36 +1,39 @@
 #!/usr/bin/python
 
 # This is a simple clone of tests/versiontest.cc
-import apt_pkg,sys,re,string;
-apt_pkg.InitConfig();
-apt_pkg.InitSystem();
+import apt_pkg
+import sys
+import re
 
-TestFile = apt_pkg.ParseCommandLine(apt_pkg.Config,[],sys.argv);
+apt_pkg.InitConfig()
+apt_pkg.InitSystem()
+
+TestFile = apt_pkg.ParseCommandLine(apt_pkg.Config, [], sys.argv)
 if len(TestFile) != 1:
-   print "Must have exactly 1 file name";
-   sys.exit(0);
+    print "Must have exactly 1 file name"
+    sys.exit(0)
 
-# Go over the file.. 
-List = open(TestFile[0],"r");
-CurLine = 0;
+# Go over the file..
+List = open(TestFile[0], "r")
+CurLine = 0
 while(1):
-   Line = List.readline();
-   CurLine = CurLine + 1;
-   if Line == "":
-      break;
-   Line = string.strip(Line);
-   if len(Line) == 0 or Line[0] == '#':
-      continue;
-   
-   Split = re.split("[ \n]",Line);
+    Line = List.readline()
+    CurLine = CurLine + 1
+    if Line == "":
+        break
+    Line = Line.strip()
+    if len(Line) == 0 or Line[0] == '#':
+        continue
+
+    Split = re.split("[ \n]", Line)
 
-   # Check forward   
-   if apt_pkg.VersionCompare(Split[0],Split[1]) != int(Split[2]):
-     print "Comparision failed on line %u. '%s' ? '%s' %i != %i"%(CurLine,
-             Split[0],Split[1],apt_pkg.VersionCompare(Split[0],Split[1]),
-             int(Split[2]));
-   # Check reverse
-   if apt_pkg.VersionCompare(Split[1],Split[0]) != -1*int(Split[2]):
-     print "Comparision failed on line %u. '%s' ? '%s' %i != %i"%(CurLine,
-             Split[1],Split[0],apt_pkg.VersionCompare(Split[1],Split[0]),
-             -1*int(Split[2]));
+    # Check forward
+    if apt_pkg.VersionCompare(Split[0], Split[1]) != int(Split[2]):
+        print "Comparision failed on line %u. '%s' ? '%s' %i != %i" % (CurLine,
+            Split[0], Split[1], apt_pkg.VersionCompare(Split[0], Split[1]),
+            int(Split[2]))
+    # Check reverse
+    if apt_pkg.VersionCompare(Split[1], Split[0]) != -1 * int(Split[2]):
+        print "Comparision failed on line %u. '%s' ? '%s' %i != %i" % (CurLine,
+            Split[1], Split[0], apt_pkg.VersionCompare(Split[1], Split[0]),
+            -1 * int(Split[2]))