summaryrefslogtreecommitdiff
path: root/apt
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-01 09:29:25 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-01 09:29:25 +0200
commiteec06677e01d9ba9d7edd95feb0cd858e7b8b6bc (patch)
tree311d72500e3146002b9c5e2350a4886d3c2b4dc5 /apt
parent73050c16039e2adc3cb09b522a0ef36de450737e (diff)
parentc8bd732d5cb8be16ae48f8a72a4ed8a266b4ce36 (diff)
downloadpython-apt-eec06677e01d9ba9d7edd95feb0cd858e7b8b6bc.tar.gz
* merged from the debian/sid bzr branch
* Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) * python/arfile.cc: - use APT::Configuration::getCompressionTypes() instead of duplicating the supported methods here * tests/test_debfile.py: - add test for raise on unknown data.tar.xxx * tests/test_aptsources_ports.py, tests/test_aptsources.py: - use tmpdir during the tests to fix test failure with apt from experimental * Upload to unstable * Increase Breaks for update-notifier to 0.99.3debian9 * utils/get_debian_mirrors.py: Adjust for new Alioth SCM urls * debian/control: Standards-Version 3.9.2 * Fix Lintian overrides * Fix spelling errors reported by Lintian (sep[a->e]rated, overrid[d]en) * po/urd.po: Remove, ur.po is the correct file * debian/source/format: Add, set it to "3.0 (native)" * Fix get_changelog in Python 3 (Closes: #626532) * apt/package.py: fix a few typos [formated->formatted] (Closes: #597054) * doc/source/tutorials/contributing.rst: minor improvements (Closes: #625225) - one typo [2to => 2to3], one broken link [pep8.py link] * Esperanto (Closes: #626430)
Diffstat (limited to 'apt')
-rw-r--r--apt/package.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/apt/package.py b/apt/package.py
index 14e80594..9223ed22 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -343,7 +343,7 @@ class Version(object):
def description(self):
"""Return the formatted long description.
- Return the formated long description according to the Debian policy
+ Return the formatted long description according to the Debian policy
(Chapter 5.6.13).
See http://www.debian.org/doc/debian-policy/ch-controlfields.html
for more information.
@@ -892,7 +892,7 @@ class Package(object):
def description(self):
"""Return the formatted long description.
- Return the formated long description according to the Debian policy
+ Return the formatted long description according to the Debian policy
(Chapter 5.6.13).
See http://www.debian.org/doc/debian-policy/ch-controlfields.html
for more information.
@@ -1142,7 +1142,7 @@ class Package(object):
return u""
# Read changelog line by line
line_raw = changelog_file.readline()
- if line_raw == "":
+ if not line_raw:
break
# The changelog is encoded in utf-8, but since there isn't
# any http header, urllib2 seems to treat it as ascii
@@ -1360,8 +1360,8 @@ def _test():
print "SourcePkg: %s " % pkg.candidate.source_name
print "Section: %s " % pkg.section
print "Summary: %s" % pkg.candidate.summary
- print "Description (formated) :\n%s" % pkg.candidate.description
- print "Description (unformated):\n%s" % pkg.candidate.raw_description
+ print "Description (formatted) :\n%s" % pkg.candidate.description
+ print "Description (unformatted):\n%s" % pkg.candidate.raw_description
print "InstalledSize: %s " % pkg.candidate.installed_size
print "PackageSize: %s " % pkg.candidate.size
print "Dependencies: %s" % pkg.installed.dependencies