Skip to content

Commit df550cc

Browse files
edschofieldedschofield
committed
Move future.builtins.types to future.types
1 parent 2a875f9 commit df550cc

19 files changed

Lines changed: 57 additions & 42 deletions

‎docs/imports.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ equivalent to typing ``bytes = bytes; int = int`` etc. for each builtin.
8080

8181
The internal API is currently as follows::
8282

83-
from future.builtins.types import bytes, dict, int, range, str
83+
from future.types import bytes, dict, int, range, str
8484
from future.builtins.misc import ascii, chr, hex, input, next, oct, open, round, super
8585
from future.builtins.iterators import filter, map, zip
8686

‎docs/isinstance.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,23 @@ to use it. (The output showing is from Py2)::
7676
>>> a
7777
100000000000000000000
7878
>>> type(a)
79-
future.builtins.types.newint.newint
79+
future.types.newint.newint
8080
>>> native(a)
8181
100000000000000000000L
8282
>>> type(native(a))
8383
long
8484
8585
>>> b = bytes(b'ABC')
8686
>>> type(b)
87-
future.builtins.types.newbytes.newbytes
87+
future.types.newbytes.newbytes
8888
>>> native(b)
8989
'ABC'
9090
>>> type(native(b))
9191
str
9292
9393
>>> s = str(u'ABC')
9494
>>> type(s)
95-
future.builtins.types.newstr.newstr
95+
future.types.newstr.newstr
9696
>>> native(s)
9797
u'ABC'
9898
>>> type(native(s))

‎docs/reference.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@ Backported types
4141

4242
bytes
4343
-----
44-
.. automodule:: future.builtins.types.newbytes
44+
.. automodule:: future.types.newbytes
4545

4646
dict
4747
-----
48-
.. automodule:: future.builtins.types.newdict
48+
.. automodule:: future.types.newdict
4949

5050
int
5151
---
5252
.. automodule:: future.builtins.backports.newint
5353

5454
range
5555
-----
56-
.. automodule:: future.builtins.types.newrange
56+
.. automodule:: future.types.newrange
5757

5858
str
5959
---
60-
.. automodule:: future.builtins.types.newstr
60+
.. automodule:: future.types.newstr
6161

‎docs/str_object.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ are illegal with Python 3. For example::
5151
>>> s2
5252
'/ABCD'
5353
>>> type(s2)
54-
future.builtins.types.newstr.newstr
54+
future.types.newstr.newstr
5555

5656
This is allowed for compatibility with parts of the Python 2 standard
5757
library and various third-party libraries that mix byte-strings and unicode

‎future/builtins/__init__.py‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
55
See the docs for these modules for more information::
66
7-
- future.builtins.types
7+
- future.types
88
- future.builtins.iterators
9-
- future.builtins.newnext
10-
- future.builtins.newround
11-
- future.builtins.newsuper
129
- future.builtins.misc
1310
- future.builtins.disabled
1411
@@ -19,7 +16,26 @@
1916
# backward-compatibility with future v0.8.2. It will be removed in future v1.0.
2017
from future.builtins.misc import (ascii, chr, hex, input, isinstance, next,
2118
oct, open, pow, round, super)
22-
from future.builtins.types import (bytes, dict, int, list, object, range, str)
19+
from future.utils import PY3
20+
21+
if PY3:
22+
import builtins
23+
bytes = builtins.bytes
24+
dict = builtins.dict
25+
int = builtins.int
26+
list = builtins.list
27+
object = builtins.object
28+
range = builtins.range
29+
str = builtins.str
30+
__all__ = []
31+
else:
32+
from future.types import (newbytes as bytes,
33+
newdict as dict,
34+
newint as int,
35+
newlist as list,
36+
newobject as object,
37+
newrange as range,
38+
newstr as str)
2339
from future import utils
2440

2541

@@ -37,5 +53,3 @@
3753
else:
3854
# No namespace pollution on Py3
3955
__all__ = []
40-
41-
# TODO: add 'callable' for Py3.0 and Py3.1?

‎future/builtins/iterators.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,18 @@
3636

3737
import itertools
3838
from future import utils
39-
from future.builtins.types import range
4039

4140
if not utils.PY3:
4241
filter = itertools.ifilter
4342
map = itertools.imap
43+
from future.types import newrange as range
4444
zip = itertools.izip
4545
__all__ = ['filter', 'map', 'range', 'zip']
4646
else:
4747
import builtins
4848
filter = builtins.filter
4949
map = builtins.map
50+
range = builtins.range
5051
zip = builtins.zip
5152
__all__ = []
5253

future/builtins/types/__init__.py renamed to future/types/__init__.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
It is used as follows::
1212
1313
from __future__ import division, absolute_import, print_function
14-
from future.builtins.types import bytes, dict, int, range, str
14+
from future.builtins import bytes, dict, int, range, str
1515
1616
to bring in the new semantics for these functions from Python 3. And
1717
then, for example::
@@ -55,12 +55,12 @@ def append(self, item):
5555
For more information:
5656
---------------------
5757
58-
- future.builtins.types.newbytes
59-
- future.builtins.types.newdict
60-
- future.builtins.types.newint
61-
- future.builtins.types.newobject
62-
- future.builtins.types.newrange
63-
- future.builtins.types.newstr
58+
- future.types.newbytes
59+
- future.types.newdict
60+
- future.types.newint
61+
- future.types.newobject
62+
- future.types.newrange
63+
- future.types.newstr
6464
6565
6666
Notes
@@ -224,12 +224,12 @@ def issubset(list1, list2):
224224
str = builtins.str
225225
__all__ = []
226226
else:
227-
from .newbytes import newbytes as bytes
228-
from .newdict import newdict as dict
229-
from .newint import newint as int
230-
from .newlist import newlist as list
231-
from .newrange import newrange as range
232-
from .newobject import newobject as object
233-
from .newstr import newstr as str
234-
__all__ = ['bytes', 'dict', 'int', 'list', 'range', 'str']
227+
from .newbytes import newbytes
228+
from .newdict import newdict
229+
from .newint import newint
230+
from .newlist import newlist
231+
from .newrange import newrange
232+
from .newobject import newobject
233+
from .newstr import newstr
234+
__all__ = ['newbytes', 'newdict', 'newint', 'newlist', 'newrange', 'newstr']
235235

future/builtins/types/newbytes.py renamed to future/types/newbytes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from numbers import Integral
1010

1111
from future.utils import istext, isbytes, PY3, with_metaclass
12-
from future.builtins.types import no, issubset
12+
from future.types import no, issubset
1313

1414

1515
_builtin_bytes = bytes
@@ -189,7 +189,7 @@ def decode(self, encoding='utf-8', errors='strict'):
189189
as well as any other name registered with codecs.register_error that is
190190
able to handle UnicodeDecodeErrors.
191191
"""
192-
from future.builtins.types.newstr import newstr
192+
from future.types.newstr import newstr
193193
return newstr(super(newbytes, self).decode(encoding, errors))
194194

195195
@no(unicode)

future/builtins/types/newdict.py renamed to future/types/newdict.py

File renamed without changes.

future/builtins/types/newint.py renamed to future/types/newint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from numbers import Integral
1313

14-
from future.builtins.types.newbytes import newbytes
14+
from future.types.newbytes import newbytes
1515
from future.utils import PY3, isint, istext, isbytes, with_metaclass
1616

1717

0 commit comments

Comments
 (0)