[robotframework] 2 new revisions pushed by mikko.ko...@gmail.com on 2011-12-12 09:29 GMT

[robotframework]

2 new revisions:

Revision: 335576a51590
Author:   Mikko Korpela <mikko.korp...@gmail.com>
Date:     Mon Dec 12 01:26:55 2011
Log:      ET.parse(StringIO("<test/>")) works with ipy 2.7.1 (2.7.0.40) but  
iter...
http://code.google.com/p/robotframework/source/detail?r=335576a51590
Revision: 9105776ba891
Author:   Mikko Korpela <mikko.korp...@gmail.com>
Date:     Mon Dec 12 01:28:14 2011
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=9105776ba891

==============================================================================
Revision: 335576a51590
Author:   Mikko Korpela <mikko.korp...@gmail.com>
Date:     Mon Dec 12 01:26:55 2011
Log:      ET.parse(StringIO("<test/>")) works with ipy 2.7.1 (2.7.0.40) but  
iterparse does not
http://code.google.com/p/robotframework/source/detail?r=335576a51590

Modified:
 /src/robot/utils/etreewrapper.py

=======================================
--- /src/robot/utils/etreewrapper.py    Fri Nov 18 04:06:37 2011
+++ /src/robot/utils/etreewrapper.py    Mon Dec 12 01:26:55 2011
@@ -21,16 +21,21 @@
     try:
         import cElementTree as ET
     except ImportError:
-        try:
-            from xml.etree import ElementTree as ET
-            # Raises ImportError due to missing expat on IronPython < 2.7.1
-            # by default http://ironpython.codeplex.com/workitem/21407
-            ET.parse(StringIO('<test/>'))
-        except ImportError:
+        if sys.platform == 'cli':
+            # See ironpython problems in xml.etree
+            # http://ironpython.codeplex.com/workitem/21407
             try:
                 from elementtree import ElementTree as ET
             except ImportError:
                 raise ImportError('No valid ElementTree XML parser module  
found')
+        else:
+            try:
+                from xml.etree import ElementTree as ET
+            except ImportError:
+                try:
+                    from elementtree import ElementTree as ET
+                except ImportError:
+                    raise ImportError('No valid ElementTree XML parser  
module found')

 def get_root(path=None, string=None, node=None):
     # This should NOT be changed to 'if not node:'. See chapter Truth  
Testing

==============================================================================
Revision: 9105776ba891
Author:   Mikko Korpela <mikko.korp...@gmail.com>
Date:     Mon Dec 12 01:28:14 2011
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=9105776ba891