Merge git://anonscm.debian.org/apt/python-apt

Conflicts:
	debian/changelog
	python/apt_pkgmodule.cc

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/examples/versiontest.py b/doc/examples/versiontest.py
index fa13cc1c..2f736161 100755
--- a/doc/examples/versiontest.py
+++ b/doc/examples/versiontest.py
@@ -5,19 +5,19 @@ import apt_pkg
 import sys
 import re
 
-apt_pkg.InitConfig()
-apt_pkg.InitSystem()
+apt_pkg.init_config()
+apt_pkg.init_system()
 
-TestFile = apt_pkg.ParseCommandLine(apt_pkg.Config, [], sys.argv)
+TestFile = apt_pkg.parse_commandline(apt_pkg.config, [], sys.argv)
 if len(TestFile) != 1:
     print "Must have exactly 1 file name"
     sys.exit(0)
 
 # Go over the file..
-List = open(TestFile[0], "r")
+list = open(TestFile[0], "r")
 CurLine = 0
 while(1):
-    Line = List.readline()
+    Line = list.readline()
     CurLine = CurLine + 1
     if Line == "":
         break
@@ -28,12 +28,12 @@ while(1):
     Split = re.split("[ \n]", Line)
 
     # Check forward
-    if apt_pkg.VersionCompare(Split[0], Split[1]) != int(Split[2]):
+    if apt_pkg.version_compare(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]),
+            Split[0], Split[1], apt_pkg.version_compare(Split[0], Split[1]),
             int(Split[2]))
     # Check reverse
-    if apt_pkg.VersionCompare(Split[1], Split[0]) != -1 * int(Split[2]):
+    if apt_pkg.version_compare(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]),
+            Split[1], Split[0], apt_pkg.version_compare(Split[1], Split[0]),
             -1 * int(Split[2]))