summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2009-04-14 00:47:23 +0200
committerJulian Andres Klode <jak@debian.org>2009-04-14 00:47:23 +0200
commit8413810c46f802490280b0be1beebaaadf1aa9f2 (patch)
tree96a6438fbd87d65b42f5754598c82a584ebf2145
parentdaaa814658b6d2b8e3e2437fcc625096c46395dd (diff)
downloadpython-apt-8413810c46f802490280b0be1beebaaadf1aa9f2.tar.gz
* Remove any trailing whitespace
-rw-r--r--apt/package.py3
-rw-r--r--doc/source/apt_pkg/index.rst2
-rw-r--r--python/apt_pkgmodule.cc2
-rw-r--r--python/cache.cc2
-rw-r--r--python/cdrom.cc6
-rw-r--r--python/configuration.cc18
-rw-r--r--python/depcache.cc12
-rw-r--r--python/progress.cc2
-rw-r--r--python/tag.cc12
-rw-r--r--python/tar.cc2
-rw-r--r--tests/getcache_mem_corruption.py6
11 files changed, 33 insertions, 34 deletions
diff --git a/apt/package.py b/apt/package.py
index 5adef15c..3ea1105d 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -639,7 +639,6 @@ class Package(object):
def installedPriority(self):
"""Return the priority (of the installed version).
-
.. deprecated:: 0.7.9
"""
return getattr(self.installed, 'priority', None)
@@ -800,7 +799,7 @@ class Package(object):
contain multiple named variables which will be substitued. These
variables are (src_section, prefix, src_pkg, src_ver). An example is
the Ubuntu changelog::
-
+
"http://changelogs.ubuntu.com/changelogs/pool" \\
"/%(src_section)s/%(prefix)s/%(src_pkg)s" \\
"/%(src_pkg)s_%(src_ver)s/changelog"
diff --git a/doc/source/apt_pkg/index.rst b/doc/source/apt_pkg/index.rst
index 38310bb5..60c3ba9b 100644
--- a/doc/source/apt_pkg/index.rst
+++ b/doc/source/apt_pkg/index.rst
@@ -252,7 +252,7 @@ Dependencies
>>> apt_pkg.ParseDepends("PkgA (>= VerA) | PkgB (>= VerB)")
[[('PkgA', 'VerA', '>='), ('PkgB', 'VerB', '>=')]]
-
+
Furthemore, this function also supports to limit the architectures, as
used in e.g. Build-Depends::
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index 5d0b2c0a..145a2bab 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -481,7 +481,7 @@ extern "C" void initapt_pkg()
if (PyType_Ready(&PkgCdromType) == -1) return;
if (PyType_Ready(&PkgProblemResolverType) == -1) return;
if (PyType_Ready(&PkgActionGroupType) == -1) return;
-
+
// Initialize the module
PyObject *Module = Py_InitModule("apt_pkg",methods);
diff --git a/python/cache.cc b/python/cache.cc
index 4db097c7..31d8c45d 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -951,7 +951,7 @@ PyObject *TmpGetCache(PyObject *Self,PyObject *Args)
progress.setCallbackInst(pyCallbackInst);
if (Cache->Open(progress,false) == false)
return HandleErrors();
- }
+ }
else {
OpTextProgress Prog;
if (Cache->Open(Prog,false) == false)
diff --git a/python/cdrom.cc b/python/cdrom.cc
index 1278d6b7..0816d93e 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -84,16 +84,16 @@ PyTypeObject PkgCdromType =
0, // tp_hash
0, // tp_call
0, // tp_str
- 0, // tp_getattro
+ 0, // tp_getattro
0, // tp_setattro
- 0, // tp_as_buffer
+ 0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
"Cdrom Object", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
- 0, // tp_iter
+ 0, // tp_iter
0, // tp_iternext
PkgCdromMethods, // tp_methods
};
diff --git a/python/configuration.cc b/python/configuration.cc
index a95ac029..b4adf357 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -498,16 +498,16 @@ PyTypeObject ConfigurationType =
0, // tp_hash
0, // tp_call
0, // tp_str
- 0, // tp_getattro
+ 0, // tp_getattro
0, // tp_setattro
- 0, // tp_as_buffer
+ 0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
"Configuration Object", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
- 0, // tp_iter
+ 0, // tp_iter
0, // tp_iternext
CnfMethods, // tp_methods
};
@@ -532,16 +532,16 @@ PyTypeObject ConfigurationPtrType =
0, // tp_hash
0, // tp_call
0, // tp_str
- 0, // tp_getattro
+ 0, // tp_getattro
0, // tp_setattro
- 0, // tp_as_buffer
+ 0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
"ConfigurationPtr Object", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
- 0, // tp_iter
+ 0, // tp_iter
0, // tp_iternext
CnfMethods, // tp_methods
};
@@ -566,16 +566,16 @@ PyTypeObject ConfigurationSubType =
0, // tp_hash
0, // tp_call
0, // tp_str
- 0, // tp_getattro
+ 0, // tp_getattro
0, // tp_setattro
- 0, // tp_as_buffer
+ 0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
"ConfigurationSub Object", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
- 0, // tp_iter
+ 0, // tp_iter
0, // tp_iternext
CnfMethods, // tp_methods
};
diff --git a/python/depcache.cc b/python/depcache.cc
index b23eecd9..2c73a1a9 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -769,16 +769,16 @@ PyTypeObject PkgProblemResolverType =
0, // tp_hash
0, // tp_call
0, // tp_str
- 0, // tp_getattro
+ 0, // tp_getattro
0, // tp_setattro
- 0, // tp_as_buffer
+ 0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
"ProblemResolver Object", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
- 0, // tp_iter
+ 0, // tp_iter
0, // tp_iternext
PkgProblemResolverMethods, // tp_methods
};
@@ -825,16 +825,16 @@ PyTypeObject PkgActionGroupType =
0, // tp_hash
0, // tp_call
0, // tp_str
- 0, // tp_getattro
+ 0, // tp_getattro
0, // tp_setattro
- 0, // tp_as_buffer
+ 0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
"ActionGroup Object", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
- 0, // tp_iter
+ 0, // tp_iter
0, // tp_iternext
PkgActionGroupMethods, // tp_methods
};
diff --git a/python/progress.cc b/python/progress.cc
index c5a1c138..bec40ce9 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -185,7 +185,7 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
bool res = true;
if(!PyArg_Parse(result, "b", &res))
{
- // most of the time the user who subclasses the pulse()
+ // most of the time the user who subclasses the pulse()
// method forgot to add a return {True,False} so we just
// assume he wants a True
return true;
diff --git a/python/tag.cc b/python/tag.cc
index baf97b59..cdea3e03 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -401,16 +401,16 @@ PyTypeObject TagSecType =
0, // tp_hash
0, // tp_call
TagSecStr, // tp_str
- 0, // tp_getattro
+ 0, // tp_getattro
0, // tp_setattro
- 0, // tp_as_buffer
+ 0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
"TagSection Object", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
- 0, // tp_iter
+ 0, // tp_iter
0, // tp_iternext
TagSecMethods // tp_methods
};
@@ -459,16 +459,16 @@ PyTypeObject TagFileType =
0, // tp_hash
0, // tp_call
0, // tp_str
- 0, // tp_getattro
+ 0, // tp_getattro
0, // tp_setattro
- 0, // tp_as_buffer
+ 0, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
"TagFile Object", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
0, // tp_weaklistoffset
- 0, // tp_iter
+ 0, // tp_iter
0, // tp_iternext
TagFileMethods, // tp_methods
0, // tp_members
diff --git a/python/tar.cc b/python/tar.cc
index f0d57823..217554c2 100644
--- a/python/tar.cc
+++ b/python/tar.cc
@@ -111,7 +111,7 @@ PyObject *tarExtract(PyObject *Self,PyObject *Args)
int fileno = PyObject_AsFileDescriptor(File);
if (fileno == -1)
return 0;
-
+
FileFd Fd(fileno,false);
ExtractTar Tar(Fd,0xFFFFFFFF,Comp);
if (_error->PendingError() == true)
diff --git a/tests/getcache_mem_corruption.py b/tests/getcache_mem_corruption.py
index 42e9af00..c3f6eff3 100644
--- a/tests/getcache_mem_corruption.py
+++ b/tests/getcache_mem_corruption.py
@@ -6,16 +6,16 @@ import re
import unittest
class TestGetCache(unittest.TestCase):
-
+
def setUp(self):
apt_pkg.InitConfig()
apt_pkg.InitSystem()
-
+
def testWrongInvocation(self):
# wrongly invoke GetCache() rather than GetDepCache()
apt_cache = apt_pkg.GetCache()
self.assertRaises(ValueError, apt_pkg.GetCache, apt_cache)
-
+
def testProperInvocation(self):
apt_cache = apt_pkg.GetCache(apt.progress.OpTextProgress())
apt_depcache = apt_pkg.GetDepCache(apt_cache)