diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/acquire.py | 7 | ||||
| -rw-r--r-- | doc/examples/action.py | 2 | ||||
| -rw-r--r-- | doc/examples/architecture.py | 2 | ||||
| -rwxr-xr-x | doc/examples/build-deps-old.py | 2 | ||||
| -rwxr-xr-x | doc/examples/checkstate.py | 4 | ||||
| -rwxr-xr-x | doc/examples/deb_inspect.py | 4 | ||||
| -rw-r--r-- | doc/examples/depcache.py | 2 | ||||
| -rw-r--r-- | doc/examples/inst.py | 2 | ||||
| -rw-r--r-- | doc/examples/progress.py | 9 | ||||
| -rw-r--r-- | doc/examples/sources.py | 2 | ||||
| -rw-r--r-- | doc/source/conf.py | 9 | ||||
| -rw-r--r-- | doc/source/examples/cache-pkgfile.py | 2 |
12 files changed, 25 insertions, 22 deletions
diff --git a/doc/examples/acquire.py b/doc/examples/acquire.py index 7381ad68..1971ba2f 100644 --- a/doc/examples/acquire.py +++ b/doc/examples/acquire.py @@ -34,7 +34,8 @@ progress = apt.progress.text.AcquireProgress() fetcher = apt_pkg.Acquire(progress) pm = apt_pkg.PackageManager(depcache) pm.get_archives(fetcher, list, recs) -print "%s (%s)" % (apt_pkg.size_to_str(fetcher.fetch_needed), fetcher.fetch_needed) +print "%s (%s)" % ( + apt_pkg.size_to_str(fetcher.fetch_needed), fetcher.fetch_needed) actiongroup = apt_pkg.ActionGroup(depcache) for pkg in cache.packages: depcache.mark_keep(pkg) @@ -65,7 +66,7 @@ for item in fetcher.items: print item if item.status == item.STAT_ERROR: print "Some error ocured: '%s'" % item.error_text - if item.complete == False: + if item.complete is False: print "No error, still nothing downloaded (%s)" % item.error_text print @@ -75,4 +76,4 @@ print "fetcher.Run() returned: %s" % res print "now runing pm.DoInstall()" res = pm.do_install(1) -print "pm.DoInstall() returned: %s"% res +print "pm.DoInstall() returned: %s" % res diff --git a/doc/examples/action.py b/doc/examples/action.py index 0399bddc..41b55144 100644 --- a/doc/examples/action.py +++ b/doc/examples/action.py @@ -36,7 +36,7 @@ depcache.init(progress) #sys.exit() # get a canidate version -ver= depcache.get_candidate_ver(iter) +ver = depcache.get_candidate_ver(iter) print "Candidate version: %s " % ver print "\n\nQuerry interface" diff --git a/doc/examples/architecture.py b/doc/examples/architecture.py index 75afb2d1..421c79a7 100644 --- a/doc/examples/architecture.py +++ b/doc/examples/architecture.py @@ -6,7 +6,7 @@ def main(): print "Native architecture:", apt_pkg.config["APT::Architecture"] print "All architectures:", apt_pkg.config.value_list("APT::Architectures") - + if __name__ == '__main__': main() diff --git a/doc/examples/build-deps-old.py b/doc/examples/build-deps-old.py index cc41aa64..4e7e4350 100755 --- a/doc/examples/build-deps-old.py +++ b/doc/examples/build-deps-old.py @@ -54,7 +54,7 @@ if srcrec: # calculate the build depends for all dependencies depends = depcache.get_candidate_ver(base).depends_list -for dep in depends["Depends"]: # FIXME: do we need to consider PreDepends? +for dep in depends["Depends"]: # FIXME: do we need to consider PreDepends? pkg = dep[0].target_pkg srcpkg_name = get_source_pkg(pkg, records, depcache) if not srcpkg_name: diff --git a/doc/examples/checkstate.py b/doc/examples/checkstate.py index 7f046c5d..084fdb87 100755 --- a/doc/examples/checkstate.py +++ b/doc/examples/checkstate.py @@ -19,11 +19,11 @@ for package in packages: continue version = versions[0] for other_version in versions: - if apt_pkg.version_compare(version.ver_str, other_version.ver_str)<0: + if apt_pkg.version_compare(version.ver_str, other_version.ver_str) < 0: version = other_version if package.current_ver: current = package.current_ver - if apt_pkg.version_compare(current.ver_str, version.ver_str)<0: + if apt_pkg.version_compare(current.ver_str, version.ver_str) < 0: upgradable[package.name] = version break else: diff --git a/doc/examples/deb_inspect.py b/doc/examples/deb_inspect.py index 3261c734..f6e090a1 100755 --- a/doc/examples/deb_inspect.py +++ b/doc/examples/deb_inspect.py @@ -10,7 +10,8 @@ import os.path def Callback(member, data): """ callback for debExtract """ print "'%s','%s',%u,%u,%u,%u,%u,%u,%u" \ - % (member.name, member.linkname, member.mode, member.uid, member.gid, member.size, member.mtime, member.major, member.minor) + % (member.name, member.linkname, member.mode, member.uid, + member.gid, member.size, member.mtime, member.major, member.minor) if __name__ == "__main__": @@ -35,7 +36,6 @@ if __name__ == "__main__": depends = sections["Depends"] print apt_pkg.parse_depends(depends) - print "extracting archive" dir = "/tmp/deb" os.mkdir(dir) diff --git a/doc/examples/depcache.py b/doc/examples/depcache.py index 919de603..8e33e98b 100644 --- a/doc/examples/depcache.py +++ b/doc/examples/depcache.py @@ -31,7 +31,7 @@ depcache.init(progress) # get a canidate version -ver= depcache.get_candidate_ver(iter) +ver = depcache.get_candidate_ver(iter) print "Candidate version: %s " % ver print "\n\nQuerry interface" diff --git a/doc/examples/inst.py b/doc/examples/inst.py index dd39c25b..25658435 100644 --- a/doc/examples/inst.py +++ b/doc/examples/inst.py @@ -17,7 +17,7 @@ class TextInstallProgress(InstallProgress): InstallProgress.updateInterface(self) if self.last >= self.percent: return - sys.stdout.write("\r[%s] %s\n" %(self.percent, self.status)) + sys.stdout.write("\r[%s] %s\n" % (self.percent, self.status)) sys.stdout.flush() self.last = self.percent diff --git a/doc/examples/progress.py b/doc/examples/progress.py index d7c4fad8..32dac330 100644 --- a/doc/examples/progress.py +++ b/doc/examples/progress.py @@ -11,7 +11,7 @@ import apt.progress.base class TextProgress(apt.progress.base.OpProgress): def __init__(self): - self.last=0.0 + self.last = 0.0 def update(self, percent): if (self.last + 1.0) <= percent: @@ -47,8 +47,11 @@ class TextFetchProgress(apt.progress.base.AcquireProgress): def pulse(self, owner): print "pulse: CPS: %s/s; Bytes: %s/%s; Item: %s/%s" % ( - apt_pkg.size_to_str(self.current_cps), apt_pkg.size_to_str(self.current_bytes), - apt_pkg.size_to_str(self.total_bytes), self.current_items, self.total_items) + apt_pkg.size_to_str(self.current_cps), + apt_pkg.size_to_str(self.current_bytes), + apt_pkg.size_to_str(self.total_bytes), + self.current_items, + self.total_items) return True def media_change(self, medium, drive): diff --git a/doc/examples/sources.py b/doc/examples/sources.py index 238ca48c..aa783758 100644 --- a/doc/examples/sources.py +++ b/doc/examples/sources.py @@ -11,6 +11,6 @@ sources = apt_pkg.SourceRecords() sources.restart() while sources.lookup('hello'): print sources.package, sources.version, sources.maintainer, \ - sources.section, `sources.binaries` + sources.section, repr(sources.binaries) print sources.files print sources.index.archive_uri(sources.files[0][2]) diff --git a/doc/source/conf.py b/doc/source/conf.py index 163f5074..7a565e16 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -36,7 +36,6 @@ if os.path.exists("../../build"): break - # General configuration # --------------------- @@ -68,7 +67,7 @@ copyright = u'2009-2010, Julian Andres Klode <jak@debian.org>' # try: - release=os.environ['DEBVER'] + release = os.environ['DEBVER'] except KeyError: from subprocess import Popen, PIPE p1 = Popen(["dpkg-parsechangelog", "-l../../debian/changelog"], @@ -82,7 +81,7 @@ for c in release.split("~")[0].split(".")[2]: if not c.isdigit(): break release_raw += c - + if int(release_raw) >= 90: version_s = release.split("~")[0].split(".")[:3] # Set the version to 0.X.100 if the release is 0.X.9Y (0.7.90 => 0.7.100) @@ -212,8 +211,8 @@ htmlhelp_basename = 'python-aptdoc' # Grouping the document tree into LaTeX files. List of tuples # (source index, target name, title, author, document class [howto/manual]). latex_documents = [ - ('contents', 'python-apt.tex', ur'python-apt Documentation', - ur'Julian Andres Klode <jak@debian.org>', 'manual'), + ('contents', 'python-apt.tex', ur'python-apt Documentation', + ur'Julian Andres Klode <jak@debian.org>', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/doc/source/examples/cache-pkgfile.py b/doc/source/examples/cache-pkgfile.py index f4cc2e66..10216c19 100644 --- a/doc/source/examples/cache-pkgfile.py +++ b/doc/source/examples/cache-pkgfile.py @@ -8,7 +8,7 @@ def main(): cache = apt_pkg.Cache() for pkgfile in cache.file_list: print 'Package-File:', pkgfile.filename - print 'Index-Type:', pkgfile.index_type # 'Debian Package Index' + print 'Index-Type:', pkgfile.index_type # 'Debian Package Index' if pkgfile.not_source: print 'Source: None' else: |
