summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-13 11:10:40 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-13 11:10:40 +0200
commit41a9f7533f9ac3824a710a7ac3cf1e01d9159e7e (patch)
treedb16f69b19448f6e93e0cf9952af2c6744c9575a /python
parenta8e7d5e6931e56fbe67f5dd33c5da0705468fe0b (diff)
parent34274f571119f0a2a3fd2fec0074aa682657b241 (diff)
downloadpython-apt-41a9f7533f9ac3824a710a7ac3cf1e01d9159e7e.tar.gz
merged from lp:~mvo/python-apt/mvo
Diffstat (limited to 'python')
-rw-r--r--python/configuration.cc2
-rw-r--r--python/tag.cc6
2 files changed, 6 insertions, 2 deletions
diff --git a/python/configuration.cc b/python/configuration.cc
index 848b664a..93e92efa 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -157,7 +157,7 @@ static PyObject *CnfClear(PyObject *Self,PyObject *Args)
// The amazing narrowing search ability!
static const char *doc_SubTree =
- "sub_tree(key: str) -> apt_pkg.Configuration\n\n"
+ "subtree(key: str) -> apt_pkg.Configuration\n\n"
"Return a new apt_pkg.Configuration object with the given option\n"
"as its root. Example:\n\n"
diff --git a/python/tag.cc b/python/tag.cc
index 97039bc4..44cd06af 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -344,8 +344,12 @@ static PyObject *TagFileJump(PyObject *Self,PyObject *Args)
// ---------------------------------------------------------------------
static PyObject *TagSecNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) {
char *Data;
+ int Len;
char *kwlist[] = {"text", 0};
- if (PyArg_ParseTupleAndKeywords(Args,kwds,"s",kwlist,&Data) == 0)
+
+ // this allows reading "byte" types from python3 - but we don't
+ // make (much) use of it yet
+ if (PyArg_ParseTupleAndKeywords(Args,kwds,"s#",kwlist,&Data,&Len) == 0)
return 0;
// Create the object..