Revision: 2501
Author: janne.t.harkonen
Date: Mon Feb 22 05:30:03 2010
Log: fix imports
http://code.google.com/p/robotframework/source/detail?r=2501
Modified:
/trunk/src/robot/utils/__init__.py
/trunk/src/robot/utils/abstractxmlwriter.py
/trunk/src/robot/utils/error.py
/trunk/src/robot/utils/htmlutils.py
/trunk/src/robot/utils/htmlwriter.py
/trunk/src/robot/utils/misc.py
/trunk/src/robot/utils/text.py
=======================================
--- /trunk/src/robot/utils/__init__.py Wed Aug 12 00:44:16 2009
+++ /trunk/src/robot/utils/__init__.py Mon Feb 22 05:30:03 2010
@@ -36,7 +36,8 @@
timestamp_to_secs, parse_time
from robottypes import is_list, is_tuple, is_scalar, is_str, is_integer, \
is_boolean, is_number, is_list_of_str, to_boolean, to_list, \
- dict2map, type_as_str, unic
+ dict2map, type_as_str
+from unic import unic
from robotversion import get_version, get_java_version
from text import cut_long_message, cut_long_assign_msg, wrap
from xmlwriter import XmlWriter
@@ -51,7 +52,7 @@
is_jython = sys.platform.startswith('java')
is_windows = os.sep == '\\' # This works also in Jython on Windows
is_cygwin = 'cygwin' in sys.platform
-platform = '%sython %s on %s' % (is_jython and 'J' or 'P',
+platform = '%sython %s on %s' % (is_jython and 'J' or 'P',
sys.version.split()[0], sys.platform)
def get_full_version(who=''):
=======================================
--- /trunk/src/robot/utils/abstractxmlwriter.py Mon Feb 22 04:46:36 2010
+++ /trunk/src/robot/utils/abstractxmlwriter.py Mon Feb 22 05:30:03 2010
@@ -13,7 +13,7 @@
# limitations under the License.
-from robottypes import unic
+from unic import unic
# See http://www.spamagogo.com/wiki/index.php/Illegal_XML_characters
=======================================
--- /trunk/src/robot/utils/error.py Mon Feb 22 04:44:57 2010
+++ /trunk/src/robot/utils/error.py Mon Feb 22 05:30:03 2010
@@ -18,8 +18,8 @@
import re
import traceback
-from match import eq
-from robottypes import is_str, unic
+from robottypes import is_str
+from unic import unic
from robot.errors import DataError, TimeoutError, RemoteError
RERAISED_EXCEPTIONS = (KeyboardInterrupt, SystemExit, MemoryError)
=======================================
--- /trunk/src/robot/utils/htmlutils.py Mon Feb 22 04:45:55 2010
+++ /trunk/src/robot/utils/htmlutils.py Mon Feb 22 05:30:03 2010
@@ -16,7 +16,8 @@
import re
import os.path
-from robottypes import is_str, unic
+from robottypes import is_str
+from unic import unic
_hr_re = re.compile('^-{3,} *$')
=======================================
--- /trunk/src/robot/utils/htmlwriter.py Mon Feb 22 04:47:03 2010
+++ /trunk/src/robot/utils/htmlwriter.py Mon Feb 22 05:30:03 2010
@@ -12,9 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+
from abstractxmlwriter import AbstractXmlWriter
from htmlutils import html_escape, html_attr_escape
-from robottypes import unic
+from unic import unic
class HtmlWriter(AbstractXmlWriter):
=======================================
--- /trunk/src/robot/utils/misc.py Mon Feb 22 04:41:34 2010
+++ /trunk/src/robot/utils/misc.py Mon Feb 22 05:30:03 2010
@@ -20,7 +20,8 @@
import posixpath
from robot.errors import FrameworkError
-from robottypes import is_str, is_list, unic, is_integer
+from robottypes import is_str, is_list, is_integer
+from unic import unic
from normalizing import normpath
=======================================
--- /trunk/src/robot/utils/text.py Mon Feb 22 04:42:16 2010
+++ /trunk/src/robot/utils/text.py Mon Feb 22 05:30:03 2010
@@ -13,7 +13,8 @@
# limitations under the License.
-from robottypes import is_str, unic
+from robottypes import is_str
+from unic import unic
_MAX_ASSIGN_LENGTH = 200
