mirror of
https://github.com/python/cpython.git
synced 2025-08-03 08:34:29 +00:00
Merged revisions 72491-72493 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r72491 | benjamin.peterson | 2009-05-08 19:33:27 -0500 (Fri, 08 May 2009) | 7 lines make 2to3 use unicode internally on 2.x This started out as a fix for #2660, but became this large refactoring when I realized the dire state this was in. 2to3 now uses tokenize.detect_encoding to decode the files correctly into unicode. ........ r72492 | benjamin.peterson | 2009-05-08 19:35:38 -0500 (Fri, 08 May 2009) | 1 line remove compat code ........ r72493 | benjamin.peterson | 2009-05-08 19:54:15 -0500 (Fri, 08 May 2009) | 1 line add a test for \r\n newlines ........
This commit is contained in:
parent
5edb1a1b0a
commit
84ad84e0bb
60 changed files with 386 additions and 245 deletions
|
@ -25,7 +25,7 @@ class FixerTestCase(support.TestCase):
|
|||
options = {"print_function" : False}
|
||||
self.refactor = support.get_refactorer(fix_list, options)
|
||||
self.fixer_log = []
|
||||
self.filename = "<string>"
|
||||
self.filename = u"<string>"
|
||||
|
||||
for fixer in chain(self.refactor.pre_order,
|
||||
self.refactor.post_order):
|
||||
|
@ -35,7 +35,7 @@ class FixerTestCase(support.TestCase):
|
|||
before = support.reformat(before)
|
||||
after = support.reformat(after)
|
||||
tree = self.refactor.refactor_string(before, self.filename)
|
||||
self.failUnlessEqual(after, str(tree))
|
||||
self.failUnlessEqual(after, unicode(tree))
|
||||
return tree
|
||||
|
||||
def check(self, before, after, ignore_warnings=False):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue