[svn r2840] support external parser in objectify.fromstring()

--HG--
branch : trunk

1 files changed, 7 insertions, 4 deletions

diff --git a/src/lxml/objectify.pyx b/src/lxml/objectify.pyx
index b737b95a..8fb32a43 100644
--- a/src/lxml/objectify.pyx
+++ b/src/lxml/objectify.pyx
@@ -1568,12 +1568,15 @@ cdef _Element _makeElement(tag, text, attrib, nsmap):
 cdef object _fromstring
 _fromstring = etree.fromstring
 
-def fromstring(xml):
-    """Objectify specific version of the lxml.etree fromstring() function.
+def fromstring(xml, parser=None):
+    """Objectify specific version of the lxml.etree fromstring() function
+    that uses the objectify parser.
 
-    NOTE: requires parser based element class lookup activated in lxml.etree!
+    You can pass a different parser as second argument.
     """
-    return _fromstring(xml, objectify_parser)
+    if parser is None:
+        parser = objectify_parser
+    return _fromstring(xml, parser)
 
 XML = fromstring