8000 Tests: Update imports: future.builtins -> builtins · thecodingchicken/python-future@b1d0420 · GitHub
[go: up one dir, main page]
Skip to content

Commit b1d0420

Browse files
edschofieldedschofield
committed
Tests: Update imports: future.builtins -> builtins
1 parent 4002f59 commit b1d0420

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎tests/test_future/test_futurize.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class Blah:
134134
pass
135135
"""
136136
after = """
137-
from future.builtins import object
137+
from builtins import object
138138
class Blah(object):
139139
pass
140140
"""
@@ -159,8 +159,8 @@ def __iter__(self):
159159
assert list(Upper('hello')) == list('HELLO')
160160
"""
161161
after = """
162-
from future.builtins import next
163-
from future.builtins import object
162+
from builtins import next
163+
from builtins import object
164164
class Upper(object):
165165
def __init__(self, iterable):
166166
self._iter = iter(iterable)
@@ -274,7 +274,7 @@ def test_izip(self):
274274
pass
275275
"""
276276
after = """
277-
from future.builtins import zip
277+
from builtins import zip
278278
for (a, b) in zip([1, 3, 5], [2, 4, 6]):
279279
pass
280280
"""
@@ -319,11 +319,11 @@ def test_import_builtins(self):
319319
super(MyClass, self)
320320
"""
321321
after = """
322-
from future.builtins import bytes
323-
from future.builtins import filter
324-
from future.builtins import input
325-
from future.builtins import map
326-
from future.builtins import range
322+
from builtins import bytes
323+
from builtins import filter
324+
from builtins import input
325+
from builtins import map
326+
from builtins import range
327327
from functools import reduce
328328
a = input()
329329
b = open(a, b, c)
@@ -340,7 +340,7 @@ def test_import_builtins(self):
340340

341341
def test_xrange(self):
342342
"""
343-
The ``from future.builtins import range`` line was being added to the
343+
The 10000 ``from builtins import range`` line was being added to the
344344
bottom of the file as of v0.11.4, but only using Py2.7's lib2to3.
345345
(Py3.3's lib2to3 seems to work.)
346346
"""
@@ -349,7 +349,7 @@ def test_xrange(self):
349349
pass
350350
"""
351351
after = """
352-
from future.builtins import range
352+
from builtins import range
353353
for i in range(10):
354354
pass
355355
"""
@@ -987,9 +987,9 @@ def test_order_future_lines(self):
987987
from __future__ import print_function
988988
from __future__ import absolute_import
989989
# blank line or comment here
990-
from future.builtins import zzz
991-
from future.builtins import aaa
992-
from future.builtins import blah
990+
from builtins import zzz
991+
from builtins import aaa
992+
from builtins import blah
993993
# another comment
994994
995995
code_here
@@ -1000,9 +1000,9 @@ def test_order_future_lines(self):
10001000
from __future__ import absolute_import
10011001
from __future__ import print_function
10021002
# blank line or comment here
1003-
from future.builtins import aaa
1004-
from future.builtins import blah
1005-
from future.builtins import zzz
1003+
from builtins import aaa
1004+
from builtins import blah
1005+
from builtins import zzz
10061006
# another comment
10071007
10081008
code_here
@@ -1045,7 +1045,7 @@ def test_range_necessary_list_calls(self):
10451045
"""
10461046
after = """
10471047
from __future__ import print_function
1048-
from future.builtins import range
1048+
from builtins import range
10491049
l = list(range(10))
10501050
assert isinstance(l, list)
10511051
for i in range(3):
@@ -1190,8 +1190,8 @@ def test_all_imports(self):
11901190
from __future__ import absolute_import
11911191
from future import standard_library
11921192
standard_library.install_hooks()
1193-
from future.builtins import range
1194-
from future.builtins import *
1193+
from builtins import range
1194+
from builtins import *
11951195
import math
11961196
import os
11971197
l = list(range(10))

‎tests/test_future/test_pasteurize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class TestPasteurize(CodeHandler):
2020
on both Py3 and Py2.
2121
"""
2222

23-
4D8F @skip26 # Python 2.6's lib2to3 causes the "from future.builtins import
23+
@skip26 # Python 2.6's lib2to3 causes the "from builtins import
2424
# range" line to be stuck at the bottom of the module!
2525
def test_range_slice(self):
2626
"""

0 commit comments

Comments
 (0)
0