* 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, 26 insertions, 22 deletions

diff --git a/doc/examples/config.py b/doc/examples/config.py
index 24d90a0d..9d4e51fc 100755
--- a/doc/examples/config.py
+++ b/doc/examples/config.py
@@ -6,49 +6,53 @@
 #   config.py -no-h --no-help --help=no  ; Turn off help
 #   config.py -qqq -q=3            ; verbosity to 3
 #   config.py -c /etc/apt/apt.conf ; include that config file]
-#   config.py -o help=true         ; Turn on help by giving a config file string
+#   config.py -o help=true         ; Turn on help by giving a
+#                                  ; config file string
 #   config.py -no-h -- -help       ; Turn off help, specify the file '-help'
 # -c and -o are standard APT-program options.
 
 # This shows how to use the system for configuration and option control.
 # The other varient is for ISC object config files. See configisc.py.
-import apt_pkg,sys,posixpath;
+import apt_pkg
+import sys
+import posixpath
 
 # Create a new empty Configuration object - there is also the system global
 # configuration object apt_pkg.Config which is used interally by apt-pkg
 # routines to control unusual situations. I recommend using the sytem global
 # whenever possible..
-Cnf = apt_pkg.newConfiguration();
+Cnf = apt_pkg.newConfiguration()
 
-print "Command line is",sys.argv
+print "Command line is", sys.argv
 
 # Load the default configuration file, InitConfig() does this better..
-Cnf.Set("config-file","/etc/apt/apt.conf");  # or Cnf["config-file"] = "..";
+Cnf.Set("config-file", "/etc/apt/apt.conf")  # or Cnf["config-file"] = ".."
 if posixpath.exists(Cnf.FindFile("config-file")):
-   apt_pkg.ReadConfigFile(Cnf,"/etc/apt/apt.conf");
+    apt_pkg.ReadConfigFile(Cnf, "/etc/apt/apt.conf")
 
 # Merge the command line arguments into the configuration space
-Arguments = [('h',"help","help"),
-             ('v',"version","version"),
-             ('q',"quiet","quiet","IntLevel"),
-             ('c',"config-file","","ConfigFile"),
-	     ('o',"option","","ArbItem")]
-print "FileNames",apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
+Arguments = [('h', "help", "help"),
+             ('v', "version", "version"),
+             ('q', "quiet", "quiet", "IntLevel"),
+             ('c', "config-file", "", "ConfigFile"),
+             ('o', "option", "", "ArbItem")]
+print "FileNames", apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
 
-print "Quiet level selected is",Cnf.FindI("quiet",0);
+print "Quiet level selected is", Cnf.FindI("quiet", 0)
 
 # Do some stuff with it
-if Cnf.FindB("version",0) == 1:
-   print "Version selected - 1.1";
+if Cnf.FindB("version", 0) == 1:
+    print "Version selected - 1.1"
 
-if Cnf.FindB("help",0) == 1:
-   print "python-apt",apt_pkg.Version,"compiled on",apt_pkg.Date,apt_pkg.Time;
-   print "Hi, I am the help text for this program";
-   sys.exit(0);
+if Cnf.FindB("help", 0) == 1:
+    print "python-apt", apt_pkg.Version, \
+          "compiled on", apt_pkg.Date, apt_pkg.Time
+    print "Hi, I am the help text for this program"
+    sys.exit(0)
 
-print "No help for you, try -h";
+print "No help for you, try -h"
 
 # Print the configuration space
-print "The Configuration space looks like:";
+print "The Configuration space looks like:"
 for I in Cnf.keys():
-   print "%s \"%s\";"%(I,Cnf[I]);
+    print "%s \"%s\";" % (I, Cnf[I])