Revision: ec1d493e7983
Author: Robot Framework Developers ([email protected])
Date: Tue Nov 8 23:08:46 2011
Log: parsing.model: cleanup of save()
http://code.google.com/p/robotframework/source/detail?r=ec1d493e7983
Modified:
/src/robot/parsing/model.py
/src/robot/writer/serializer.py
/utest/writer/test_serializer.py
=======================================
--- /src/robot/parsing/model.py Sun Oct 23 22:24:25 2011
+++ /src/robot/parsing/model.py Tue Nov 8 23:08:46 2011
@@ -97,7 +97,7 @@
:param **options: Configuration for serialization. Any optional
arguments
of robot.writer.serializer.SerializationContext can be given.
"""
- Serializer(SerializationContext(self, **options)).serialize()
+ Serializer().serialize(self, **options)
class TestCaseFile(_TestData):
=======================================
--- /src/robot/writer/serializer.py Sun Oct 23 22:07:33 2011
+++ /src/robot/writer/serializer.py Tue Nov 8 23:08:46 2011
@@ -65,21 +65,19 @@
class Serializer(object):
-
- def __init__(self, context):
- """The Serializer class is used to serialize Robot Framework test
data files.
-
- :param SerializationContext context: The context used with this
serializer.
+ """The Serializer class is used to serialize Robot Framework test data
files.
+ """
+
+ def serialize(self, datafile, **options):
+ """Serializes given `datafile` using `**options`.
+
+ :param datafile: A robot.parsing.model.DataFile object to be
serialized
+ :param **options: A SerializationContext is initialized based on
these
"""
- self._ctx = context
-
- def serialize(self):
- """Does the actual serialization, based on the context given in
- :py:meth:`__init__`.
- """
- self._writer = FileWriter(self._ctx)
- self._serialize(self._ctx.datafile)
- self._ctx.finish()
+ context = SerializationContext(datafile, **options)
+ self._writer = FileWriter(context)
+ self._serialize(context.datafile)
+ context.finish()
def _serialize(self, datafile):
for table in datafile:
=======================================
--- /utest/writer/test_serializer.py Sat Oct 22 23:54:02 2011
+++ /utest/writer/test_serializer.py Tue Nov 8 23:08:46 2011
@@ -37,10 +37,9 @@
line_separator=os.linesep):
datafile.source = '/not/really/here.' + extension
output = StringIO.StringIO()
- context = SerializationContext(datafile, output=output,
- pipe_separated=pipe_separated,
- line_separator=line_separator)
- Serializer(context).serialize()
+ Serializer().serialize(datafile, output=output,
+ pipe_separated=pipe_separated,
+ line_separator=line_separator)
return output.getvalue()
def _assert_serialization_with_different_line_separators(self,
datafile,
