[Lxml-checkins] r43957 - lxml/branch/html/src/lxml/html

[ianb at codespeak.net]

Author: ianb
Date: Fri Jun  1 06:41:43 2007
New Revision: 43957

Modified:
   lxml/branch/html/src/lxml/html/__init__.py
Log:
remove the sub-module function wrappers

Modified: lxml/branch/html/src/lxml/html/__init__.py
==============================================================================
--- lxml/branch/html/src/lxml/html/__init__.py	(original)
+++ lxml/branch/html/src/lxml/html/__init__.py	Fri Jun  1 06:41:43 2007
@@ -243,29 +243,6 @@
 iter_links = _MethodFunc('iter_links')
 rewrite_links = _MethodFunc('rewrite_links')
 
-class _SubmoduleFunc(object):
-    def __init__(self, module, name, doc=None):
-        self.module = module
-        self.name = name
-        self.obj = None
-        if doc is None:
-            doc = 'See %s.%s' % (module, name)
-        self.__doc__ = doc
-    def __call__(self, *args, **kw):
-        if self.obj is None:
-            import sys
-            __import__(self.module)
-            mod = sys.modules(self.module)
-            self.obj = getattr(mod, self.name)
-            self.__doc__ = self.obj.__doc__
-        return self.obj(*args, **kw)
-
-# FIXME: Damn module names conflict with the function names :(
-#clean = _SubmoduleFunc('lxml.html.clean', 'clean')
-#clean_html = _SubmoduleFunc('lxml.html.clean', 'clean_html')
-#htmldiff = _SubmoduleFunc('lxml.html.htmldiff', 'htmldiff')
-#html_annotate = _SubmoduleFunc('lxml.html.htmldiff', 'html_annotate')
-
 class HtmlComment(etree.CommentBase, HtmlMixin):
     pass