From ea815d93dda86504518bdf69488b1f336f2439a3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 23 Oct 2013 19:38:48 +0200 Subject: python/{depcache.cc,string.cc}: Ignore deprecation warnings for some calls Those functions are deprecated in APT, but we still need to provide them for backwards compatibility. --- python/depcache.cc | 2 ++ python/generic.h | 5 +++++ python/string.cc | 2 ++ 3 files changed, 9 insertions(+) (limited to 'python') diff --git a/python/depcache.cc b/python/depcache.cc index 9f4b91b4..b257e2c9 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -895,7 +895,9 @@ static PyObject *PkgProblemResolverInstallProtect(PyObject *Self,PyObject *Args) pkgProblemResolver *fixer = GetCpp(Self); if (PyArg_ParseTuple(Args,"") == 0) return 0; + PY_APT_BEGIN_DEPRECATED; fixer->InstallProtect(); + PY_APT_END_DEPRECATED; Py_INCREF(Py_None); return HandleErrors(Py_None); } diff --git a/python/generic.h b/python/generic.h index c9db916c..26736f1a 100644 --- a/python/generic.h +++ b/python/generic.h @@ -75,6 +75,11 @@ typedef int Py_ssize_t; #define PyErr_WarnEx(cat,msg,stacklevel) PyErr_Warn(cat,msg) #endif +#define PY_APT_BEGIN_DEPRECATED { \ + _Pragma("GCC diagnostic push"); \ + _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\""); } +#define PY_APT_END_DEPRECATED _Pragma("GCC diagnostic pop") + static inline const char *PyUnicode_AsString(PyObject *op) { // Convert to bytes object, using the default encoding. diff --git a/python/string.cc b/python/string.cc index 62aa34e7..9b02c933 100644 --- a/python/string.cc +++ b/python/string.cc @@ -113,8 +113,10 @@ PyObject *StrStrToTime(PyObject *Self,PyObject *Args) return 0; time_t Result; + PY_APT_BEGIN_DEPRECATED; if (StrToTime(Str,Result) == false) { + PY_APT_END_DEPRECATED; Py_INCREF(Py_None); return Py_None; } -- cgit v1.2.3