* 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, 42 insertions, 40 deletions

diff --git a/tests/cache.py b/tests/cache.py
index 47d9a3b4..87a544e8 100644
--- a/tests/cache.py
+++ b/tests/cache.py
@@ -1,49 +1,51 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/python
 #
 # Test for the pkgCache code
-# 
+#
 
 import apt_pkg
 import sys
 
+
 def main():
-	apt_pkg.init()
-	cache = apt_pkg.GetCache()
-	depcache = apt_pkg.GetDepCache(cache)
-	depcache.Init()
-	i=0
-	all=cache.PackageCount
-	print "Running Cache test on all packages:"
-	# first, get all pkgs
-	for pkg in cache.Packages:
-		i += 1
-		x = pkg.Name
-		# then get each version
-		for ver in pkg.VersionList:
-			# get some version information
-			a = ver.FileList
-			b = ver.VerStr
-			c = ver.Arch
-			d = ver.DependsListStr
-			dl = ver.DependsList
-			# get all dependencies (a dict of string->list, 
-			# e.g. "depends:" -> [ver1,ver2,..]
-			for dep in dl.keys():
-				# get the list of each dependency object
-				for depVerList in dl[dep]:
-					for z in depVerList:
-						# get all TargetVersions of
-						# the dependency object
-						for j in z.AllTargets():
-							f = j.FileList
-							g = ver.VerStr
-							h = ver.Arch
-							k = ver.DependsListStr
-							j = ver.DependsList
-							pass
-				
-		print "\r%i/%i=%.3f%%    " % (i,all,(float(i)/float(all)*100)),
+    apt_pkg.init()
+    cache = apt_pkg.GetCache()
+    depcache = apt_pkg.GetDepCache(cache)
+    depcache.Init()
+    i=0
+    all=cache.PackageCount
+    print "Running Cache test on all packages:"
+    # first, get all pkgs
+    for pkg in cache.Packages:
+        i += 1
+        x = pkg.Name
+        # then get each version
+        for ver in pkg.VersionList:
+            # get some version information
+            a = ver.FileList
+            b = ver.VerStr
+            c = ver.Arch
+            d = ver.DependsListStr
+            dl = ver.DependsList
+            # get all dependencies (a dict of string->list,
+            # e.g. "depends:" -> [ver1,ver2,..]
+            for dep in dl.keys():
+                # get the list of each dependency object
+                for depVerList in dl[dep]:
+                    for z in depVerList:
+                        # get all TargetVersions of
+                        # the dependency object
+                        for j in z.AllTargets():
+                            f = j.FileList
+                            g = ver.VerStr
+                            h = ver.Arch
+                            k = ver.DependsListStr
+                            j = ver.DependsList
+                            pass
+
+        print "\r%i/%i=%.3f%%    " % (i, all, (float(i) / float(all) * 100)),
+
 
 if __name__ == "__main__":
-	main()
-	sys.exit(0)
+    main()
+    sys.exit(0)