summaryrefslogtreecommitdiff
path: root/python/depcache.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-06-01 17:14:30 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-06-01 17:14:30 +0200
commit015acac98dc88fbbca5672c6be678c8dea491a8e (patch)
treeea4c6b4a385aa25d96746886589f2928e58891af /python/depcache.cc
parente74ead9f918b38bfe8ae5cfe941df4057dcc509e (diff)
downloadpython-apt-015acac98dc88fbbca5672c6be678c8dea491a8e.tar.gz
revert commit 346 (this re-enable the deprecation warnings)
Diffstat (limited to 'python/depcache.cc')
-rw-r--r--python/depcache.cc19
1 files changed, 8 insertions, 11 deletions
diff --git a/python/depcache.cc b/python/depcache.cc
index e7d7d946..cd098f2f 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -766,9 +766,8 @@ PyTypeObject PyDepCache_Type =
#ifdef COMPAT_0_7
PyObject *GetDepCache(PyObject *Self,PyObject *Args)
{
- if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL)
- PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated"
- ". Please see apt_pkg.DepCache() for the replacement.",1);
+ PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated"
+ ". Please see apt_pkg.DepCache() for the replacement.",1);
return PkgDepCacheNew(&PyDepCache_Type,Args,0);
}
#endif
@@ -801,10 +800,9 @@ static PyObject *PkgProblemResolverNew(PyTypeObject *type,PyObject *Args,PyObjec
#ifdef COMPAT_0_7
PyObject *GetPkgProblemResolver(PyObject *Self,PyObject *Args) {
- if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL)
- PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is"
- " deprecated. Please see apt_pkg.ProblemResolver() for the "
- "replacement.", 1);
+ PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is"
+ " deprecated. Please see apt_pkg.ProblemResolver() for the "
+ "replacement.", 1);
return PkgProblemResolverNew(&PyProblemResolver_Type,Args,0);
}
#endif
@@ -1093,10 +1091,9 @@ PyTypeObject PyActionGroup_Type =
#ifdef COMPAT_0_7
PyObject *GetPkgActionGroup(PyObject *Self,PyObject *Args)
{
- if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL)
- PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is "
- "deprecated. Please see apt_pkg.ActionGroup() for the "
- "replacement.", 1);
+ PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is "
+ "deprecated. Please see apt_pkg.ActionGroup() for the "
+ "replacement.", 1);
return PkgActionGroupNew(&PyActionGroup_Type,Args,0);
}
#endif