2 new revisions:
Revision: 23f9735190dc
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 03:07:26 2012
Log: cannot use relative imports here
http://code.google.com/p/robotframework/source/detail?r=23f9735190dc
Revision: cb5b41288fd2
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 03:15:00 2012
Log: XML lib: Explicitly open/close saved files because older ET
versions d...
http://code.google.com/p/robotframework/source/detail?r=cb5b41288fd2
==============================================================================
Revision: 23f9735190dc
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 03:07:26 2012
Log: cannot use relative imports here
http://code.google.com/p/robotframework/source/detail?r=23f9735190dc
Modified:
/src/robot/libraries/Dialogs.py
=======================================
--- /src/robot/libraries/Dialogs.py Tue Sep 18 01:17:25 2012
+++ /src/robot/libraries/Dialogs.py Tue Sep 18 03:07:26 2012
@@ -27,11 +27,11 @@
import sys
if sys.platform.startswith('java'):
- from .dialogs_jy import MessageDialog, PassFailDialog, InputDialog,
SelectionDialog
+ from dialogs_jy import MessageDialog, PassFailDialog, InputDialog,
SelectionDialog
elif sys.platform == 'cli':
- from .dialogs_ipy import MessageDialog, PassFailDialog, InputDialog,
SelectionDialog
+ from dialogs_ipy import MessageDialog, PassFailDialog, InputDialog,
SelectionDialog
else:
- from .dialogs_py import MessageDialog, PassFailDialog, InputDialog,
SelectionDialog
+ from dialogs_py import MessageDialog, PassFailDialog, InputDialog,
SelectionDialog
try:
from robot.version import get_version
==============================================================================
Revision: cb5b41288fd2
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 03:15:00 2012
Log: XML lib: Explicitly open/close saved files because older ET
versions don't close files they open and Jython and IPY don't close them
implicitly.
http://code.google.com/p/robotframework/source/detail?r=cb5b41288fd2
Modified:
/src/robot/libraries/XML.py
=======================================
--- /src/robot/libraries/XML.py Tue Sep 18 02:08:30 2012
+++ /src/robot/libraries/XML.py Tue Sep 18 03:15:00 2012
@@ -15,7 +15,6 @@
from __future__ import with_statement
import re
-import sys
from robot.api import logger
from robot.libraries.BuiltIn import BuiltIn
@@ -703,7 +702,9 @@
def save_xml(self, source, path, encoding='UTF-8'):
tree = ET.ElementTree(self.get_element(source))
kwargs = {'xml_declaration': True} if ET.VERSION >= '1.3' else {}
- tree.write(path, encoding, **kwargs)
+ # Older ET versions don't close files they open.
+ with open(path, 'w') as output:
+ tree.write(output, encoding, **kwargs)
class ElementComparator(object):
