diff options
author | Sylvain <syt@logilab.fr> | 2008-04-29 16:17:36 +0200 |
---|---|---|
committer | Sylvain <syt@logilab.fr> | 2008-04-29 16:17:36 +0200 |
commit | a316a6c260eb2a63726cc10eca75ac76217ebcf1 (patch) | |
tree | 9f3afb2cfd8ad0775a1e7f2947ad1ac2f9a2cc8c | |
parent | 1735784d51123aa2a8ddcab3139347510b92469a (diff) | |
parent | 9b09d5f522e6d0bf2fdfc4ab73cb51c30e9309d0 (diff) | |
download | logilab-common-a316a6c260eb2a63726cc10eca75ac76217ebcf1.tar.gz |
merge
-rw-r--r-- | deprecation.py | 41 | ||||
-rw-r--r-- | textutils.py | 5 |
2 files changed, 25 insertions, 21 deletions
diff --git a/deprecation.py b/deprecation.py index 48f5402..804aeb8 100644 --- a/deprecation.py +++ b/deprecation.py @@ -21,8 +21,6 @@ __docformat__ = "restructuredtext en" import sys from warnings import warn -from logilab.common.modutils import LazyObject, load_module_from_name - class deprecated(type): """metaclass to print a warning on instantiation of a deprecated class""" @@ -105,31 +103,34 @@ def moved(modpath, objname): instead (which has no lazy import feature though). """ def callnew(*args, **kwargs): + from logilab.common.modutils import load_module_from_name message = "object %s has been moved to module %s" % (objname, modpath) warn(message, DeprecationWarning, stacklevel=2) m = load_module_from_name(modpath) return getattr(m, objname)(*args, **kwargs) return callnew +# from logilab.common.modutils import LazyObject + +# class WarnLazyObject(LazyObject): +# def __init__(self, oldname, newname): +# # XXX doesn't work if module isn't in a package +# package, module = newname.rsplit('.', 1) +# super(WarnLazyObject, self).__init__(package, module) +# self.oldname = oldname +# self.newname = newname +# print 'hop', oldname, newname +# sys.modules[oldname] = self + +# def __getobj(self): +# if self._imported is None: +# message = "module %s has moved, it's now %s" % ( +# self.oldname, self.newname) +# warn(message, DeprecationWarning, stacklevel=2) +# return super(WarnLazyObject, self).__getobj() + -class WarnLazyObject(LazyObject): - def __init__(self, oldname, newname): - # XXX doesn't work if module isn't in a package - package, module = newname.rsplit('.', 1) - super(WarnLazyObject, self).__init__(package, module) - self.oldname = oldname - self.newname = newname - print 'hop', oldname, newname - sys.modules[oldname] = self - - def __getobj(self): - if self._imported is None: - message = "module %s has moved, it's now %s" % ( - self.oldname, self.newname) - warn(message, DeprecationWarning, stacklevel=2) - return super(WarnLazyObject, self).__getobj() - -module_moved = WarnLazyObject +# module_moved = WarnLazyObject def obsolete(reason="This function is obsolete"): """this function is an alternative to `deprecated_function` diff --git a/textutils.py b/textutils.py index 7114f68..1582e3e 100644 --- a/textutils.py +++ b/textutils.py @@ -46,7 +46,10 @@ __docformat__ = "restructuredtext en" import re from unicodedata import normalize as _uninormalize -from os import linesep +try: + from os import linesep +except ImportError: + linesep = '\n' # gae MANUAL_UNICODE_MAP = { |