merge from the debian branch

1 files changed, 24 insertions, 19 deletions

diff --git a/doc/examples/configisc.py b/doc/examples/configisc.py
index 1773a919..de8ec6be 100755
--- a/doc/examples/configisc.py
+++ b/doc/examples/configisc.py
@@ -8,32 +8,37 @@
 # doc/examples/ftp-archive.conf
 # or a bind8 config file..
 
-import apt_pkg,sys,posixpath;
+import apt_pkg
+import sys
+import posixpath
 
-ConfigFile = apt_pkg.ParseCommandLine(apt_pkg.Config,[],sys.argv);
+ConfigFile = apt_pkg.ParseCommandLine(apt_pkg.Config, [], sys.argv)
 
 if len(ConfigFile) != 1:
-   print "Must have exactly 1 file name";
-   sys.exit(0);
+    print "Must have exactly 1 file name"
+    sys.exit(0)
 
-Cnf = apt_pkg.newConfiguration();
-apt_pkg.ReadConfigFileISC(Cnf,ConfigFile[0]);
+Cnf = apt_pkg.newConfiguration()
+apt_pkg.ReadConfigFileISC(Cnf, ConfigFile[0])
 
 # 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])
 
 # bind8 config file..
-if Cnf.has_key("Zone"):
-   print "Zones: ",Cnf.SubTree("zone").List();
-   for I in Cnf.List("zone"):
-      SubCnf = Cnf.SubTree(I);
-      if SubCnf.Find("type") == "slave":
-         print "Masters for %s: %s"%(SubCnf.MyTag(),SubCnf.ValueList("masters"));
+if Cnf.Exists("Zone"):
+    print "Zones: ", Cnf.SubTree("zone").List()
+    for I in Cnf.List("zone"):
+        SubCnf = Cnf.SubTree(I)
+        if SubCnf.Find("type") == "slave":
+            print "Masters for %s: %s" % (
+                SubCnf.MyTag(), SubCnf.ValueList("masters"))
 else:
-   print "Tree definitions:";
-   for I in Cnf.List("tree"):
-      SubCnf = Cnf.SubTree(I);
-      # This could use Find which would eliminate the possibility of exceptions.
-      print "Subtree %s with sections '%s' and architectures '%s'"%(SubCnf.MyTag(),SubCnf["Sections"],SubCnf["Architectures"]);
+    print "Tree definitions:"
+    for I in Cnf.List("tree"):
+        SubCnf = Cnf.SubTree(I)
+        # This could use Find which would eliminate the possibility of
+        # exceptions.
+        print "Subtree %s with sections '%s' and architectures '%s'" % (
+            SubCnf.MyTag(), SubCnf["Sections"], SubCnf["Architectures"])