Author: Brian Kearns <bdkea...@gmail.com>
Branch: fix-tpname
Changeset: r71186:a6480afa6617
Date: 2014-05-02 01:13 -0400
http://bitbucket.org/pypy/pypy/changeset/a6480afa6617/
Log: remove some more __module__s
diff --git a/pypy/module/_cffi_backend/cbuffer.py
b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -56,8 +56,7 @@
raise
MiniBuffer.typedef = TypeDef(
- "buffer",
- __module__ = "_cffi_backend",
+ "_cffi_backend.buffer",
__len__ = interp2app(MiniBuffer.descr_len),
__getitem__ = interp2app(MiniBuffer.descr_getitem),
__setitem__ = interp2app(MiniBuffer.descr_setitem),
diff --git a/pypy/module/_cffi_backend/cdataobj.py
b/pypy/module/_cffi_backend/cdataobj.py
--- a/pypy/module/_cffi_backend/cdataobj.py
+++ b/pypy/module/_cffi_backend/cdataobj.py
@@ -441,7 +441,7 @@
W_CData.typedef = TypeDef(
- 'CData',
+ '_cffi_backend.CData',
__module__ = '_cffi_backend',
__name__ = '<cdata>',
__repr__ = interp2app(W_CData.repr),
diff --git a/pypy/module/_cffi_backend/ctypearray.py
b/pypy/module/_cffi_backend/ctypearray.py
--- a/pypy/module/_cffi_backend/ctypearray.py
+++ b/pypy/module/_cffi_backend/ctypearray.py
@@ -130,8 +130,7 @@
return self.ctitem.convert_to_object(result)
W_CDataIter.typedef = TypeDef(
- 'CDataIter',
- __module__ = '_cffi_backend',
+ '_cffi_backend.CDataIter',
__iter__ = interp2app(W_CDataIter.iter_w),
next = interp2app(W_CDataIter.next_w),
)
diff --git a/pypy/module/_cffi_backend/ctypeobj.py
b/pypy/module/_cffi_backend/ctypeobj.py
--- a/pypy/module/_cffi_backend/ctypeobj.py
+++ b/pypy/module/_cffi_backend/ctypeobj.py
@@ -210,8 +210,7 @@
W_CType.typedef = TypeDef(
- 'CTypeDescr',
- __module__ = '_cffi_backend',
+ '_cffi_backend.CTypeDescr',
__repr__ = interp2app(W_CType.repr),
__weakref__ = make_weakref_descr(W_CType),
kind = GetSetProperty(W_CType.fget_kind, doc="kind"),
diff --git a/pypy/module/_cffi_backend/ctypestruct.py
b/pypy/module/_cffi_backend/ctypestruct.py
--- a/pypy/module/_cffi_backend/ctypestruct.py
+++ b/pypy/module/_cffi_backend/ctypestruct.py
@@ -307,8 +307,7 @@
W_CField.typedef = TypeDef(
- 'CField',
- __module__ = '_cffi_backend',
+ '_cffi_backend.CField',
type = interp_attrproperty('ctype', W_CField),
offset = interp_attrproperty('offset', W_CField),
bitshift = interp_attrproperty('bitshift', W_CField),
diff --git a/pypy/module/_cffi_backend/libraryobj.py
b/pypy/module/_cffi_backend/libraryobj.py
--- a/pypy/module/_cffi_backend/libraryobj.py
+++ b/pypy/module/_cffi_backend/libraryobj.py
@@ -85,8 +85,7 @@
W_Library.typedef = TypeDef(
- 'Library',
- __module__ = '_cffi_backend',
+ '_cffi_backend.Library',
__repr__ = interp2app(W_Library.repr),
load_function = interp2app(W_Library.load_function),
read_variable = interp2app(W_Library.read_variable),
diff --git a/pypy/module/_collections/interp_deque.py
b/pypy/module/_collections/interp_deque.py
--- a/pypy/module/_collections/interp_deque.py
+++ b/pypy/module/_collections/interp_deque.py
@@ -463,11 +463,10 @@
W_Deque.__init__(space.interp_w(W_Deque, w_self), space)
return w_self
-W_Deque.typedef = TypeDef("deque",
+W_Deque.typedef = TypeDef("collections.deque",
__doc__ = """deque(iterable[, maxlen]) --> deque object
Build an ordered collection accessible from endpoints only.""",
- __module__ = '_collections',
__new__ = interp2app(descr__new__),
__init__ = interp2app(W_Deque.init),
append = interp2app(W_Deque.append),
diff --git a/pypy/module/_collections/test/test_deque.py
b/pypy/module/_collections/test/test_deque.py
--- a/pypy/module/_collections/test/test_deque.py
+++ b/pypy/module/_collections/test/test_deque.py
@@ -4,6 +4,8 @@
def test_basics(self):
from _collections import deque
+ assert deque.__module__ == 'collections'
+
d = deque(xrange(-5125, -5000))
d.__init__(xrange(200))
for i in xrange(200, 400):
diff --git a/pypy/module/_csv/interp_csv.py b/pypy/module/_csv/interp_csv.py
--- a/pypy/module/_csv/interp_csv.py
+++ b/pypy/module/_csv/interp_csv.py
@@ -154,8 +154,7 @@
W_Dialect.typedef = TypeDef(
- 'Dialect',
- __module__ = '_csv',
+ '_csv.Dialect',
__new__ = interp2app(W_Dialect___new__),
delimiter = interp_attrproperty('delimiter', W_Dialect),
diff --git a/pypy/module/_csv/interp_reader.py
b/pypy/module/_csv/interp_reader.py
--- a/pypy/module/_csv/interp_reader.py
+++ b/pypy/module/_csv/interp_reader.py
@@ -245,8 +245,7 @@
return W_Reader(space, dialect, w_iter)
W_Reader.typedef = TypeDef(
- 'reader',
- __module__ = '_csv',
+ '_csv.reader',
dialect = interp_attrproperty_w('dialect', W_Reader),
line_num = interp_attrproperty('line_num', W_Reader),
__iter__ = interp2app(W_Reader.iter_w),
diff --git a/pypy/module/_csv/interp_writer.py
b/pypy/module/_csv/interp_writer.py
--- a/pypy/module/_csv/interp_writer.py
+++ b/pypy/module/_csv/interp_writer.py
@@ -160,8 +160,7 @@
return W_Writer(space, dialect, w_fileobj)
W_Writer.typedef = TypeDef(
- 'writer',
- __module__ = '_csv',
+ '_csv.writer',
dialect = interp_attrproperty_w('dialect', W_Writer),
writerow = interp2app(W_Writer.writerow),
writerows = interp2app(W_Writer.writerows),
diff --git a/pypy/module/_io/interp_bufferedio.py
b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -844,10 +844,9 @@
self.state = STATE_OK
W_BufferedReader.typedef = TypeDef(
- 'BufferedReader', W_BufferedIOBase.typedef,
+ '_io.BufferedReader', W_BufferedIOBase.typedef,
__new__ = generic_new_descr(W_BufferedReader),
__init__ = interp2app(W_BufferedReader.descr_init),
- __module__ = "_io",
read = interp2app(W_BufferedReader.read_w),
peek = interp2app(W_BufferedReader.peek_w),
@@ -892,10 +891,9 @@
self.state = STATE_OK
W_BufferedWriter.typedef = TypeDef(
- 'BufferedWriter', W_BufferedIOBase.typedef,
+ '_io.BufferedWriter', W_BufferedIOBase.typedef,
__new__ = generic_new_descr(W_BufferedWriter),
__init__ = interp2app(W_BufferedWriter.descr_init),
- __module__ = "_io",
write = interp2app(W_BufferedWriter.write_w),
flush = interp2app(W_BufferedWriter.flush_w),
@@ -1015,10 +1013,9 @@
self.state = STATE_OK
W_BufferedRandom.typedef = TypeDef(
- 'BufferedRandom', W_BufferedIOBase.typedef,
+ '_io.BufferedRandom', W_BufferedIOBase.typedef,
__new__ = generic_new_descr(W_BufferedRandom),
__init__ = interp2app(W_BufferedRandom.descr_init),
- __module__ = "_io",
read = interp2app(W_BufferedRandom.read_w),
peek = interp2app(W_BufferedRandom.peek_w),
diff --git a/pypy/module/_io/interp_stringio.py
b/pypy/module/_io/interp_stringio.py
--- a/pypy/module/_io/interp_stringio.py
+++ b/pypy/module/_io/interp_stringio.py
@@ -264,8 +264,7 @@
W_StringIO.typedef = TypeDef(
- 'StringIO', W_TextIOBase.typedef,
- __module__ = "_io",
+ '_io.StringIO', W_TextIOBase.typedef,
__new__ = generic_new_descr(W_StringIO),
__init__ = interp2app(W_StringIO.descr_init),
__getstate__ = interp2app(W_StringIO.descr_getstate),
diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -1015,11 +1015,10 @@
self.chunk_size = size
W_TextIOWrapper.typedef = TypeDef(
- 'TextIOWrapper', W_TextIOBase.typedef,
+ '_io.TextIOWrapper', W_TextIOBase.typedef,
__new__ = generic_new_descr(W_TextIOWrapper),
__init__ = interp2app(W_TextIOWrapper.descr_init),
__repr__ = interp2app(W_TextIOWrapper.descr_repr),
- __module__ = "_io",
next = interp2app(W_TextIOWrapper.next_w),
read = interp2app(W_TextIOWrapper.read_w),
diff --git a/pypy/module/_lsprof/interp_lsprof.py
b/pypy/module/_lsprof/interp_lsprof.py
--- a/pypy/module/_lsprof/interp_lsprof.py
+++ b/pypy/module/_lsprof/interp_lsprof.py
@@ -441,7 +441,6 @@
W_Profiler.typedef = TypeDef(
'_lsprof.Profiler',
- __module__ = '_lsprof',
__new__ = interp2app(descr_new_profile),
enable = interp2app(W_Profiler.enable),
disable = interp2app(W_Profiler.disable),
diff --git a/pypy/module/_multiprocessing/interp_connection.py
b/pypy/module/_multiprocessing/interp_connection.py
--- a/pypy/module/_multiprocessing/interp_connection.py
+++ b/pypy/module/_multiprocessing/interp_connection.py
@@ -353,9 +353,8 @@
return bool(r)
W_FileConnection.typedef = TypeDef(
- 'Connection', W_BaseConnection.typedef,
+ '_multiprocessing.Connection', W_BaseConnection.typedef,
__new__ = interp2app(W_FileConnection.descr_new_file.im_func),
- __module__ = '_multiprocessing',
fileno = interp2app(W_FileConnection.fileno),
)
@@ -534,8 +533,7 @@
if sys.platform == 'win32':
W_PipeConnection.typedef = TypeDef(
- 'PipeConnection', W_BaseConnection.typedef,
+ '_multiprocessing.PipeConnection', W_BaseConnection.typedef,
__new__ = interp2app(W_PipeConnection.descr_new_pipe.im_func),
- __module__ = '_multiprocessing',
fileno = interp2app(W_PipeConnection.fileno),
)
diff --git a/pypy/module/exceptions/interp_exceptions.py
b/pypy/module/exceptions/interp_exceptions.py
--- a/pypy/module/exceptions/interp_exceptions.py
+++ b/pypy/module/exceptions/interp_exceptions.py
@@ -207,9 +207,8 @@
return interp2app(descr_new_base_exception)
W_BaseException.typedef = TypeDef(
- 'BaseException',
+ 'exceptions.BaseException',
__doc__ = W_BaseException.__doc__,
- __module__ = 'exceptions',
__new__ = _new(W_BaseException),
__init__ = interp2app(W_BaseException.descr_init),
__str__ = interp2app(W_BaseException.descr_str),
@@ -311,10 +310,9 @@
""")
W_UnicodeTranslateError.typedef = TypeDef(
- 'UnicodeTranslateError',
+ 'exceptions.UnicodeTranslateError',
W_UnicodeError.typedef,
__doc__ = W_UnicodeTranslateError.__doc__,
- __module__ = 'exceptions',
__new__ = _new(W_UnicodeTranslateError),
__init__ = interp2app(W_UnicodeTranslateError.descr_init),
__str__ = interp2app(W_UnicodeTranslateError.descr_str),
@@ -395,10 +393,9 @@
return W_BaseException.descr_str(self, space)
W_EnvironmentError.typedef = TypeDef(
- 'EnvironmentError',
+ 'exceptions.EnvironmentError',
W_StandardError.typedef,
__doc__ = W_EnvironmentError.__doc__,
- __module__ = 'exceptions',
__new__ = _new(W_EnvironmentError),
__reduce__ = interp2app(W_EnvironmentError.descr_reduce),
__init__ = interp2app(W_EnvironmentError.descr_init),
@@ -452,10 +449,9 @@
_winerror_to_errno, _default_errno = {}, 22 # EINVAL
W_WindowsError.typedef = TypeDef(
- "WindowsError",
+ "exceptions.WindowsError",
W_OSError.typedef,
__doc__ = W_WindowsError.__doc__,
- __module__ = 'exceptions',
__new__ = _new(W_WindowsError),
__init__ = interp2app(W_WindowsError.descr_init),
__str__ = interp2app(W_WindowsError.descr_str),
@@ -556,14 +552,13 @@
return W_StandardError.descr_repr(self, space)
W_SyntaxError.typedef = TypeDef(
- 'SyntaxError',
+ 'exceptions.SyntaxError',
W_StandardError.typedef,
__new__ = _new(W_SyntaxError),
__init__ = interp2app(W_SyntaxError.descr_init),
__str__ = interp2app(W_SyntaxError.descr_str),
__repr__ = interp2app(W_SyntaxError.descr_repr),
__doc__ = W_SyntaxError.__doc__,
- __module__ = 'exceptions',
msg = readwrite_attrproperty_w('w_msg', W_SyntaxError),
filename = readwrite_attrproperty_w('w_filename', W_SyntaxError),
lineno = readwrite_attrproperty_w('w_lineno', W_SyntaxError),
@@ -592,12 +587,11 @@
W_BaseException.descr_init(self, space, args_w)
W_SystemExit.typedef = TypeDef(
- 'SystemExit',
+ 'exceptions.SystemExit',
W_BaseException.typedef,
__new__ = _new(W_SystemExit),
__init__ = interp2app(W_SystemExit.descr_init),
__doc__ = W_SystemExit.__doc__,
- __module__ = 'exceptions',
code = readwrite_attrproperty_w('w_code', W_SystemExit)
)
@@ -657,10 +651,9 @@
""")
W_UnicodeDecodeError.typedef = TypeDef(
- 'UnicodeDecodeError',
+ 'exceptions.UnicodeDecodeError',
W_UnicodeError.typedef,
__doc__ = W_UnicodeDecodeError.__doc__,
- __module__ = 'exceptions',
__new__ = _new(W_UnicodeDecodeError),
__init__ = interp2app(W_UnicodeDecodeError.descr_init),
__str__ = interp2app(W_UnicodeDecodeError.descr_str),
@@ -752,10 +745,9 @@
""")
W_UnicodeEncodeError.typedef = TypeDef(
- 'UnicodeEncodeError',
+ 'exceptions.UnicodeEncodeError',
W_UnicodeError.typedef,
__doc__ = W_UnicodeEncodeError.__doc__,
- __module__ = 'exceptions',
__new__ = _new(W_UnicodeEncodeError),
__init__ = interp2app(W_UnicodeEncodeError.descr_init),
__str__ = interp2app(W_UnicodeEncodeError.descr_str),
diff --git a/pypy/module/itertools/interp_itertools.py
b/pypy/module/itertools/interp_itertools.py
--- a/pypy/module/itertools/interp_itertools.py
+++ b/pypy/module/itertools/interp_itertools.py
@@ -57,8 +57,7 @@
return space.wrap(r)
W_Count.typedef = TypeDef(
- 'count',
- __module__ = 'itertools',
+ 'itertools.count',
__new__ = interp2app(W_Count___new__),
__iter__ = interp2app(W_Count.iter_w),
next = interp2app(W_Count.next_w),
@@ -120,8 +119,7 @@
return space.wrap(r)
W_Repeat.typedef = TypeDef(
- 'repeat',
- __module__ = 'itertools',
+ 'itertools.repeat',
__new__ = interp2app(W_Repeat___new__),
__iter__ = interp2app(W_Repeat.iter_w),
__length_hint__ = interp2app(W_Repeat.length_w),
@@ -174,8 +172,7 @@
W_TakeWhile.typedef = TypeDef(
- 'takewhile',
- __module__ = 'itertools',
+ 'itertools.takewhile',
__new__ = interp2app(W_TakeWhile___new__),
__iter__ = interp2app(W_TakeWhile.iter_w),
next = interp2app(W_TakeWhile.next_w),
@@ -223,8 +220,7 @@
W_DropWhile.typedef = TypeDef(
- 'dropwhile',
- __module__ = 'itertools',
+ 'itertools.dropwhile',
__new__ = interp2app(W_DropWhile___new__),
__iter__ = interp2app(W_DropWhile.iter_w),
next = interp2app(W_DropWhile.next_w),
@@ -280,8 +276,7 @@
return space.wrap(r)
W_IFilter.typedef = TypeDef(
- 'ifilter',
- __module__ = 'itertools',
+ 'itertools.ifilter',
__new__ = interp2app(W_IFilter___new__),
__iter__ = interp2app(W_IFilter.iter_w),
next = interp2app(W_IFilter.next_w),
@@ -308,8 +303,7 @@
return space.wrap(r)
W_IFilterFalse.typedef = TypeDef(
- 'ifilterfalse',
- __module__ = 'itertools',
+ 'itertools.ifilterfalse',
__new__ = interp2app(W_IFilterFalse___new__),
__iter__ = interp2app(W_IFilterFalse.iter_w),
next = interp2app(W_IFilterFalse.next_w),
@@ -417,8 +411,7 @@
return space.wrap(r)
W_ISlice.typedef = TypeDef(
- 'islice',
- __module__ = 'itertools',
+ 'itertools.islice',
__new__ = interp2app(W_ISlice___new__),
__iter__ = interp2app(W_ISlice.iter_w),
next = interp2app(W_ISlice.next_w),
@@ -482,8 +475,7 @@
return space.wrap(r)
W_Chain.typedef = TypeDef(
- 'chain',
- __module__ = 'itertools',
+ 'itertools.chain',
__new__ = interp2app(W_Chain___new__),
__iter__ = interp2app(W_Chain.iter_w),
next = interp2app(W_Chain.next_w),
@@ -564,8 +556,7 @@
return space.wrap(r)
W_IMap.typedef = TypeDef(
- 'imap',
- __module__ = 'itertools',
+ 'itertools.imap',
__new__ = interp2app(W_IMap___new__),
__iter__ = interp2app(W_IMap.iter_w),
next = interp2app(W_IMap.next_w),
@@ -609,8 +600,7 @@
return space.wrap(r)
W_IZip.typedef = TypeDef(
- 'izip',
- __module__ = 'itertools',
+ 'itertools.izip',
__new__ = interp2app(W_IZip___new__),
__iter__ = interp2app(W_IZip.iter_w),
next = interp2app(W_IZip.next_w),
@@ -678,8 +668,7 @@
return space.wrap(self)
W_IZipLongest.typedef = TypeDef(
- 'izip_longest',
- __module__ = 'itertools',
+ 'itertools.izip_longest',
__new__ = interp2app(W_IZipLongest___new__),
__iter__ = interp2app(W_IZipLongest.iter_w),
next = interp2app(W_IZipLongest.next_w),
@@ -737,8 +726,7 @@
return space.wrap(r)
W_Cycle.typedef = TypeDef(
- 'cycle',
- __module__ = 'itertools',
+ 'itertools.cycle',
__new__ = interp2app(W_Cycle___new__),
__iter__ = interp2app(W_Cycle.iter_w),
next = interp2app(W_Cycle.next_w),
@@ -778,8 +766,7 @@
return space.wrap(r)
W_StarMap.typedef = TypeDef(
- 'starmap',
- __module__ = 'itertools',
+ 'itertools.starmap',
__new__ = interp2app(W_StarMap___new__),
__iter__ = interp2app(W_StarMap.iter_w),
next = interp2app(W_StarMap.next_w),
@@ -879,8 +866,7 @@
myiter.chained_list))
W_TeeIterable.typedef = TypeDef(
- '_tee',
- __module__ = 'itertools',
+ 'itertools._tee',
__new__ = interp2app(W_TeeIterable___new__),
__iter__ = interp2app(W_TeeIterable.iter_w),
next = interp2app(W_TeeIterable.next_w),
@@ -983,8 +969,7 @@
return space.wrap(r)
W_GroupBy.typedef = TypeDef(
- 'groupby',
- __module__ = 'itertools',
+ 'itertools.groupby',
__new__ = interp2app(W_GroupBy___new__),
__iter__ = interp2app(W_GroupBy.iter_w),
next = interp2app(W_GroupBy.next_w),
@@ -1031,8 +1016,7 @@
return w_obj
W_GroupByIterator.typedef = TypeDef(
- '_groupby',
- __module__ = 'itertools',
+ 'itertools._groupby',
__iter__ = interp2app(W_GroupByIterator.iter_w),
next = interp2app(W_GroupByIterator.next_w))
W_GroupByIterator.typedef.acceptable_as_base_class = False
@@ -1063,8 +1047,7 @@
return space.wrap(r)
W_Compress.typedef = TypeDef(
- 'compress',
- __module__ = 'itertools',
+ 'itertools.compress',
__new__ = interp2app(W_Compress__new__),
__iter__ = interp2app(W_Compress.iter_w),
next = interp2app(W_Compress.next_w),
@@ -1159,8 +1142,7 @@
return space.wrap(r)
W_Product.typedef = TypeDef(
- 'product',
- __module__ = 'itertools',
+ 'itertools.product',
__new__ = interp2app(W_Product__new__),
__iter__ = interp2app(W_Product.iter_w),
next = interp2app(W_Product.next_w),
@@ -1263,8 +1245,7 @@
res.__init__(space, pool_w, indices, r)
return space.wrap(res)
-W_Combinations.typedef = TypeDef("combinations",
- __module__ = 'itertools',
+W_Combinations.typedef = TypeDef("itertools.combinations",
__new__ = interp2app(W_Combinations__new__),
__iter__ = interp2app(W_Combinations.descr__iter__),
next = interp2app(W_Combinations.descr_next),
@@ -1298,8 +1279,8 @@
res.__init__(space, pool_w, indices, r)
return space.wrap(res)
-W_CombinationsWithReplacement.typedef =
TypeDef("combinations_with_replacement",
- __module__ = 'itertools',
+W_CombinationsWithReplacement.typedef = TypeDef(
+ "itertools.combinations_with_replacement",
__new__ = interp2app(W_CombinationsWithReplacement__new__),
__iter__ = interp2app(W_CombinationsWithReplacement.descr__iter__),
next = interp2app(W_CombinationsWithReplacement.descr_next),
@@ -1364,8 +1345,7 @@
res.__init__(space, pool_w, r)
return space.wrap(res)
-W_Permutations.typedef = TypeDef("permutations",
- __module__ = 'itertools',
+W_Permutations.typedef = TypeDef("itertools.permutations",
__new__ = interp2app(W_Permutations__new__),
__iter__ = interp2app(W_Permutations.descr__iter__),
next = interp2app(W_Permutations.descr_next),
diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -235,7 +235,7 @@
raise mmap_error(space, e)
return space.wrap(self)
-W_MMap.typedef = TypeDef("mmap",
+W_MMap.typedef = TypeDef("mmap.mmap",
__new__ = interp2app(mmap),
close = interp2app(W_MMap.close),
read_byte = interp2app(W_MMap.read_byte),
@@ -251,7 +251,6 @@
flush = interp2app(W_MMap.flush),
move = interp2app(W_MMap.move),
resize = interp2app(W_MMap.resize),
- __module__ = "mmap",
__len__ = interp2app(W_MMap.__len__),
__getitem__ = interp2app(W_MMap.descr_getitem),
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
