diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-06-01 17:14:30 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-06-01 17:14:30 +0200 |
| commit | 015acac98dc88fbbca5672c6be678c8dea491a8e (patch) | |
| tree | ea4c6b4a385aa25d96746886589f2928e58891af /python/cdrom.cc | |
| parent | e74ead9f918b38bfe8ae5cfe941df4057dcc509e (diff) | |
| download | python-apt-015acac98dc88fbbca5672c6be678c8dea491a8e.tar.gz | |
revert commit 346 (this re-enable the deprecation warnings)
Diffstat (limited to 'python/cdrom.cc')
| -rw-r--r-- | python/cdrom.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/python/cdrom.cc b/python/cdrom.cc index e6cc8e29..7f89e9d3 100644 --- a/python/cdrom.cc +++ b/python/cdrom.cc @@ -81,10 +81,9 @@ static PyObject *cdrom_ident(PyObject *Self,PyObject *Args) #ifdef COMPAT_0_7 static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "Method 'Ident' of the " - "'apt_pkg.Cdrom' object is deprecated, use 'ident' instead.", - 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "Method 'Ident' of the " + "'apt_pkg.Cdrom' object is deprecated, use 'ident' instead.", + 1); pkgCdrom &Cdrom = GetCpp<pkgCdrom>(Self); PyObject *pyCdromProgressInst = 0; @@ -169,9 +168,8 @@ PyTypeObject PyCdrom_Type = { #ifdef COMPAT_0_7 PyObject *GetCdrom(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCdrom() is deprecated. " - "Please see apt_pkg.Cdrom() for the replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCdrom() is deprecated. " + "Please see apt_pkg.Cdrom() for the replacement.", 1); return cdrom_new(&PyCdrom_Type,Args,0); } #endif |