diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-07-05 22:06:22 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-07-05 22:06:22 +0300 |
| commit | 622812485150fa7864910ee2f710d5aab2fa9e6d (patch) | |
| tree | b3bc4fd72bb80e74ba5a60d8b3d47e610dff012e /python/configuration.cc | |
| parent | 798846ab8337471998b0a4d796d6d409453faa7d (diff) | |
| parent | fdd173dd444098ed533cbcd541a7f10f228bc47e (diff) | |
| download | python-apt-622812485150fa7864910ee2f710d5aab2fa9e6d.tar.gz | |
Merge git://anonscm.debian.org/apt/python-apt
Conflicts:
debian/changelog
python/apt_pkgmodule.cc
Diffstat (limited to 'python/configuration.cc')
| -rw-r--r-- | python/configuration.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/python/configuration.cc b/python/configuration.cc index 37374625..c57bc79c 100644 --- a/python/configuration.cc +++ b/python/configuration.cc @@ -351,8 +351,8 @@ char *doc_LoadConfig = "options in the configuration object."; PyObject *LoadConfig(PyObject *Self,PyObject *Args) { - char *Name = 0; - if (PyArg_ParseTuple(Args,"Os",&Self,&Name) == 0) + PyApt_Filename Name; + if (PyArg_ParseTuple(Args,"OO&",&Self,PyApt_Filename::Converter, &Name) == 0) return 0; if (PyConfiguration_Check(Self)== 0) { @@ -373,8 +373,8 @@ char *doc_LoadConfigISC = "configuration files."; PyObject *LoadConfigISC(PyObject *Self,PyObject *Args) { - char *Name = 0; - if (PyArg_ParseTuple(Args,"Os",&Self,&Name) == 0) + PyApt_Filename Name; + if (PyArg_ParseTuple(Args,"OO&",&Self,PyApt_Filename::Converter, &Name) == 0) return 0; if (PyConfiguration_Check(Self)== 0) { @@ -394,8 +394,8 @@ char *doc_LoadConfigDir = "correct order."; PyObject *LoadConfigDir(PyObject *Self,PyObject *Args) { - char *Name = 0; - if (PyArg_ParseTuple(Args,"Os",&Self,&Name) == 0) + PyApt_Filename Name; + if (PyArg_ParseTuple(Args,"OO&",&Self,PyApt_Filename::Converter, &Name) == 0) return 0; if (PyConfiguration_Check(Self)== 0) { |