Cope with windows newlines on unix, removed simplejson import from test_treewalkers as it's not used there.

tbroyer · tbroyer · commit b3eeca8ddc38 · 2007-05-31T07:55:47.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40648
diff --git a/tests/test_tokenizer.py b/tests/test_tokenizer.py
@@ -13,7 +13,7 @@ class simplejson:
         def load(f):
             true, false = True, False
             input=re.sub(r'(".*?(?<!\\)")',r'u\1',f.read().decode('utf-8'))
-            return eval(input)
+            return eval(input.replace('\r',''))
         load = staticmethod(load)
 
 #RELEASE remove
diff --git a/tests/test_treewalkers.py b/tests/test_treewalkers.py
@@ -5,17 +5,6 @@
 import unittest
 import new
 
-try:
-    import simplejson
-except:
-    import re
-    class simplejson:
-        def load(f):
-            true, false = True, False
-            input=re.sub(r'(".*?(?<!\\)")',r'u\1',f.read().decode('utf-8'))
-            return eval(input)
-        load = staticmethod(load)
-
 sys.path.insert(0, os.path.split(os.path.abspath(__file__))[0])
 from test_parser import parseTestcase
 
