[Lxml-checkins] r46641 - lxml/trunk/src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Sat Sep 15 17:13:00 2007
New Revision: 46641

Modified:
   lxml/trunk/src/lxml/etree.pyx
   lxml/trunk/src/lxml/objectify.pyx
Log:
adapt more imports to Cython

Modified: lxml/trunk/src/lxml/etree.pyx
==============================================================================
--- lxml/trunk/src/lxml/etree.pyx	(original)
+++ lxml/trunk/src/lxml/etree.pyx	Sat Sep 15 17:13:00 2007
@@ -1,7 +1,6 @@
 cimport tree, python, config
 from tree cimport xmlDoc, xmlNode, xmlAttr, xmlNs, _isElement, _getNs
-from python cimport issubclass, callable
-from python cimport _cstr, _isString
+from python cimport callable, _cstr, _isString
 cimport xpath
 cimport xinclude
 cimport c14n

Modified: lxml/trunk/src/lxml/objectify.pyx
==============================================================================
--- lxml/trunk/src/lxml/objectify.pyx	(original)
+++ lxml/trunk/src/lxml/objectify.pyx	Sat Sep 15 17:13:00 2007
@@ -1,7 +1,7 @@
 from etreepublic cimport _Document, _Element, ElementBase
 from etreepublic cimport _ElementIterator, ElementClassLookup
 from etreepublic cimport elementFactory, import_etree, textOf
-from python cimport callable, issubclass, _cstr
+from python cimport callable, _cstr
 cimport etreepublic as cetree
 cimport python
 cimport tree
@@ -806,7 +806,7 @@
         self._type = type_class
         self.type_check = type_check
         if stringify is None:
-            self._add_text = _StringValueSetter(__builtin__.str)
+            self._add_text = _StringValueSetter(str)
         else:
             self._add_text = _StringValueSetter(stringify)
         self._schema_types = []