diff options
| -rw-r--r-- | lib/bb/__init__.py | 44 | ||||
| -rw-r--r-- | lib/bb/parse/parse_py/BBHandler.py | 2 |
2 files changed, 42 insertions, 4 deletions
diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index 8bda65e19..7c88f650a 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -52,7 +52,45 @@ def fatal(*args): bb.msg.fatal(None, ''.join(args)) +def deprecated(func, name = None, advice = ""): + """This is a decorator which can be used to mark functions + as deprecated. It will result in a warning being emmitted + when the function is used.""" + import warnings + + if advice: + advice = ": %s" % advice + if name is None: + name = func.__name__ + + def newFunc(*args, **kwargs): + warnings.warn("Call to deprecated function %s%s." % (name, + advice), + category = DeprecationWarning, + stacklevel = 2) + return func(*args, **kwargs) + newFunc.__name__ = func.__name__ + newFunc.__doc__ = func.__doc__ + newFunc.__dict__.update(func.__dict__) + return newFunc + # For compatibility -from bb.fetch import MalformedUrl, encodeurl, decodeurl -from bb.utils import mkdirhier, movefile, copyfile, which -from bb.utils import vercmp_string as vercmp +def deprecate_import(current, modulename, fromlist, renames = None): + """Import objects from one module into another, wrapping them with a DeprecationWarning""" + import sys + + module = __import__(modulename, fromlist = fromlist) + for position, objname in enumerate(fromlist): + obj = getattr(module, objname) + newobj = deprecated(obj, "{0}.{1}".format(current, objname), + "Please use {0}.{1} instead".format(modulename, objname)) + if renames: + newname = renames[position] + else: + newname = objname + + setattr(sys.modules[current], newname, newobj) + +deprecate_import(__name__, "bb.fetch", ("MalformedUrl", "encodeurl", "decodeurl")) +deprecate_import(__name__, "bb.utils", ("mkdirhier", "movefile", "copyfile", "which")) +deprecate_import(__name__, "bb.utils", ["vercmp_string"], ["vercmp"]) diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index c053b5bfd..a770131fb 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -33,7 +33,7 @@ from ConfHandler import include, init from bb.parse import resolve_file, ast # For compatibility -from bb.parse import vars_from_file +bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"]) __func_start_regexp__ = re.compile( r"(((?P<py>python)|(?P<fr>fakeroot))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" ) __inherit_regexp__ = re.compile( r"inherit\s+(.+)" ) |