[pypy-commit] pypy win32-fixes3: merge default into branch
mattip
noreply at buildbot.pypy.org
Sat Jun 1 21:11:02 CEST 2013
Author: mattip <matti.picus at gmail.com>
Branch: win32-fixes3
Changeset: r64703:416013f3e0de
Date: 2013-06-01 22:10 +0300
http://bitbucket.org/pypy/pypy/changeset/416013f3e0de/
Log: merge default into branch
diff too long, truncating to 2000 out of 7875 lines
diff --git a/lib-python/2.7/distutils/command/build_ext.py b/lib-python/2.7/distutils/command/build_ext.py
--- a/lib-python/2.7/distutils/command/build_ext.py
+++ b/lib-python/2.7/distutils/command/build_ext.py
@@ -8,7 +8,7 @@
__revision__ = "$Id$"
-import sys, os, string, re
+import sys, os, string, re, imp
from types import *
from site import USER_BASE, USER_SITE
from distutils.core import Command
@@ -33,6 +33,11 @@
from distutils.ccompiler import show_compilers
show_compilers()
+def _get_c_extension_suffix():
+ for ext, mod, typ in imp.get_suffixes():
+ if typ == imp.C_EXTENSION:
+ return ext
+
class build_ext (Command):
@@ -677,10 +682,18 @@
# OS/2 has an 8 character module (extension) limit :-(
if os.name == "os2":
ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
+ # PyPy tweak: first try to get the C extension suffix from
+ # 'imp'. If it fails we fall back to the 'SO' config var, like
+ # the previous version of this code did. This should work for
+ # CPython too. The point is that on PyPy with cpyext, the
+ # config var 'SO' is just ".so" but we want to return
+ # ".pypy-VERSION.so" instead.
+ so_ext = _get_c_extension_suffix()
+ if so_ext is None:
+ so_ext = get_config_var('SO') # fall-back
# extensions in debug_mode are named 'module_d.pyd' under windows
- so_ext = get_config_var('SO')
if os.name == 'nt' and self.debug:
- return os.path.join(*ext_path) + '_d' + so_ext
+ so_ext = '_d.pyd'
return os.path.join(*ext_path) + so_ext
def get_export_symbols (self, ext):
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py b/lib-python/2.7/distutils/sysconfig_pypy.py
--- a/lib-python/2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
@@ -12,7 +12,6 @@
import sys
import os
-import imp
from distutils.errors import DistutilsPlatformError
@@ -58,16 +57,11 @@
_config_vars = None
-def _get_so_extension():
- for ext, mod, typ in imp.get_suffixes():
- if typ == imp.C_EXTENSION:
- return ext
-
def _init_posix():
"""Initialize the module as appropriate for POSIX systems."""
g = {}
g['EXE'] = ""
- g['SO'] = _get_so_extension() or ".so"
+ g['SO'] = ".so"
g['SOABI'] = g['SO'].rsplit('.')[0]
g['LIBDIR'] = os.path.join(sys.prefix, 'lib')
g['CC'] = "gcc -pthread" # -pthread might not be valid on OS/X, check
@@ -80,7 +74,7 @@
"""Initialize the module as appropriate for NT"""
g = {}
g['EXE'] = ".exe"
- g['SO'] = _get_so_extension() or ".pyd"
+ g['SO'] = ".pyd"
g['SOABI'] = g['SO'].rsplit('.')[0]
global _config_vars
diff --git a/lib-python/2.7/logging/__init__.py b/lib-python/2.7/logging/__init__.py
--- a/lib-python/2.7/logging/__init__.py
+++ b/lib-python/2.7/logging/__init__.py
@@ -134,20 +134,22 @@
DEBUG = 10
NOTSET = 0
-_levelNames = {
- CRITICAL : 'CRITICAL',
- ERROR : 'ERROR',
- WARNING : 'WARNING',
- INFO : 'INFO',
- DEBUG : 'DEBUG',
- NOTSET : 'NOTSET',
- 'CRITICAL' : CRITICAL,
- 'ERROR' : ERROR,
- 'WARN' : WARNING,
- 'WARNING' : WARNING,
- 'INFO' : INFO,
- 'DEBUG' : DEBUG,
- 'NOTSET' : NOTSET,
+_levelToName = {
+ CRITICAL: 'CRITICAL',
+ ERROR: 'ERROR',
+ WARNING: 'WARNING',
+ INFO: 'INFO',
+ DEBUG: 'DEBUG',
+ NOTSET: 'NOTSET',
+}
+_nameToLevel = {
+ 'CRITICAL': CRITICAL,
+ 'ERROR': ERROR,
+ 'WARN': WARNING,
+ 'WARNING': WARNING,
+ 'INFO': INFO,
+ 'DEBUG': DEBUG,
+ 'NOTSET': NOTSET,
}
def getLevelName(level):
@@ -164,7 +166,7 @@
Otherwise, the string "Level %s" % level is returned.
"""
- return _levelNames.get(level, ("Level %s" % level))
+ return _levelToName.get(level, ("Level %s" % level))
def addLevelName(level, levelName):
"""
@@ -174,8 +176,8 @@
"""
_acquireLock()
try: #unlikely to cause an exception, but you never know...
- _levelNames[level] = levelName
- _levelNames[levelName] = level
+ _levelToName[level] = levelName
+ _nameToLevel[levelName] = level
finally:
_releaseLock()
@@ -183,9 +185,9 @@
if isinstance(level, int):
rv = level
elif str(level) == level:
- if level not in _levelNames:
+ if level not in _nameToLevel:
raise ValueError("Unknown level: %r" % level)
- rv = _levelNames[level]
+ rv = _nameToLevel[level]
else:
raise TypeError("Level not an integer or a valid string: %r" % level)
return rv
@@ -277,7 +279,7 @@
self.lineno = lineno
self.funcName = func
self.created = ct
- self.msecs = (ct - long(ct)) * 1000
+ self.msecs = (ct - int(ct)) * 1000
self.relativeCreated = (self.created - _startTime) * 1000
if logThreads and thread:
self.thread = thread.get_ident()
diff --git a/lib-python/2.7/logging/config.py b/lib-python/2.7/logging/config.py
--- a/lib-python/2.7/logging/config.py
+++ b/lib-python/2.7/logging/config.py
@@ -156,7 +156,7 @@
h = klass(*args)
if "level" in opts:
level = cp.get(sectname, "level")
- h.setLevel(logging._levelNames[level])
+ h.setLevel(level)
if len(fmt):
h.setFormatter(formatters[fmt])
if issubclass(klass, logging.handlers.MemoryHandler):
@@ -187,7 +187,7 @@
opts = cp.options(sectname)
if "level" in opts:
level = cp.get(sectname, "level")
- log.setLevel(logging._levelNames[level])
+ log.setLevel(level)
for h in root.handlers[:]:
root.removeHandler(h)
hlist = cp.get(sectname, "handlers")
@@ -237,7 +237,7 @@
existing.remove(qn)
if "level" in opts:
level = cp.get(sectname, "level")
- logger.setLevel(logging._levelNames[level])
+ logger.setLevel(level)
for h in logger.handlers[:]:
logger.removeHandler(h)
logger.propagate = propagate
diff --git a/lib-python/2.7/socket.py b/lib-python/2.7/socket.py
--- a/lib-python/2.7/socket.py
+++ b/lib-python/2.7/socket.py
@@ -96,6 +96,7 @@
_realsocket = socket
+_type = type
# WSA error codes
if sys.platform.lower().startswith("win"):
@@ -173,31 +174,37 @@
__doc__ = _realsocket.__doc__
+ __slots__ = ["_sock", "__weakref__"]
+
def __init__(self, family=AF_INET, type=SOCK_STREAM, proto=0, _sock=None):
if _sock is None:
_sock = _realsocket(family, type, proto)
+ elif _type(_sock) is _realsocket:
+ _sock._reuse()
+ # PyPy note about refcounting: implemented with _reuse()/_drop()
+ # on the class '_socket.socket'. Python 3 did it differently
+ # with a reference counter on this class 'socket._socketobject'
+ # instead, but it is a less compatible change (breaks eventlet).
self._sock = _sock
- self._io_refs = 0
- self._closed = False
def send(self, data, flags=0):
- return self._sock.send(data, flags=flags)
+ return self._sock.send(data, flags)
send.__doc__ = _realsocket.send.__doc__
def recv(self, buffersize, flags=0):
- return self._sock.recv(buffersize, flags=flags)
+ return self._sock.recv(buffersize, flags)
recv.__doc__ = _realsocket.recv.__doc__
def recv_into(self, buffer, nbytes=0, flags=0):
- return self._sock.recv_into(buffer, nbytes=nbytes, flags=flags)
+ return self._sock.recv_into(buffer, nbytes, flags)
recv_into.__doc__ = _realsocket.recv_into.__doc__
def recvfrom(self, buffersize, flags=0):
- return self._sock.recvfrom(buffersize, flags=flags)
+ return self._sock.recvfrom(buffersize, flags)
recvfrom.__doc__ = _realsocket.recvfrom.__doc__
def recvfrom_into(self, buffer, nbytes=0, flags=0):
- return self._sock.recvfrom_into(buffer, nbytes=nbytes, flags=flags)
+ return self._sock.recvfrom_into(buffer, nbytes, flags)
recvfrom_into.__doc__ = _realsocket.recvfrom_into.__doc__
def sendto(self, data, param2, param3=None):
@@ -208,13 +215,17 @@
sendto.__doc__ = _realsocket.sendto.__doc__
def close(self):
- # This function should not reference any globals. See issue #808164.
+ s = self._sock
+ if type(s) is _realsocket:
+ s._drop()
self._sock = _closedsocket()
close.__doc__ = _realsocket.close.__doc__
def accept(self):
sock, addr = self._sock.accept()
- return _socketobject(_sock=sock), addr
+ sockobj = _socketobject(_sock=sock)
+ sock._drop() # already a copy in the _socketobject()
+ return sockobj, addr
accept.__doc__ = _realsocket.accept.__doc__
def dup(self):
@@ -228,24 +239,7 @@
Return a regular file object corresponding to the socket. The mode
and bufsize arguments are as for the built-in open() function."""
- self._io_refs += 1
- return _fileobject(self, mode, bufsize)
-
- def _decref_socketios(self):
- if self._io_refs > 0:
- self._io_refs -= 1
- if self._closed:
- self.close()
-
- def _real_close(self):
- # This function should not reference any globals. See issue #808164.
- self._sock.close()
-
- def close(self):
- # This function should not reference any globals. See issue #808164.
- self._closed = True
- if self._io_refs <= 0:
- self._real_close()
+ return _fileobject(self._sock, mode, bufsize)
family = property(lambda self: self._sock.family, doc="the socket family")
type = property(lambda self: self._sock.type, doc="the socket type")
@@ -286,6 +280,8 @@
"_close"]
def __init__(self, sock, mode='rb', bufsize=-1, close=False):
+ if type(sock) is _realsocket:
+ sock._reuse()
self._sock = sock
self.mode = mode # Not actually used in this version
if bufsize < 0:
@@ -320,16 +316,11 @@
if self._sock:
self.flush()
finally:
- if self._sock:
- if self._close:
- self._sock.close()
- else:
- try:
- self._sock._decref_socketios()
- except AttributeError:
- pass # bah, someone built a _fileobject manually
- # with some unexpected replacement of the
- # _socketobject class
+ s = self._sock
+ if type(s) is _realsocket:
+ s._drop()
+ if self._close:
+ self._sock.close()
self._sock = None
def __del__(self):
diff --git a/lib-python/2.7/test/test_logging.py b/lib-python/2.7/test/test_logging.py
--- a/lib-python/2.7/test/test_logging.py
+++ b/lib-python/2.7/test/test_logging.py
@@ -65,7 +65,8 @@
self.saved_handlers = logging._handlers.copy()
self.saved_handler_list = logging._handlerList[:]
self.saved_loggers = logger_dict.copy()
- self.saved_level_names = logging._levelNames.copy()
+ self.saved_name_to_level = logging._nameToLevel.copy()
+ self.saved_level_to_name = logging._levelToName.copy()
finally:
logging._releaseLock()
@@ -97,8 +98,10 @@
self.root_logger.setLevel(self.original_logging_level)
logging._acquireLock()
try:
- logging._levelNames.clear()
- logging._levelNames.update(self.saved_level_names)
+ logging._levelToName.clear()
+ logging._levelToName.update(self.saved_level_to_name)
+ logging._nameToLevel.clear()
+ logging._nameToLevel.update(self.saved_name_to_level)
logging._handlers.clear()
logging._handlers.update(self.saved_handlers)
logging._handlerList[:] = self.saved_handler_list
diff --git a/lib_pypy/cffi/vengine_cpy.py b/lib_pypy/cffi/vengine_cpy.py
--- a/lib_pypy/cffi/vengine_cpy.py
+++ b/lib_pypy/cffi/vengine_cpy.py
@@ -156,6 +156,9 @@
class FFILibrary(object):
_cffi_python_module = module
_cffi_ffi = self.ffi
+ _cffi_dir = []
+ def __dir__(self):
+ return FFILibrary._cffi_dir + list(self.__dict__)
library = FFILibrary()
module._cffi_setup(lst, ffiplatform.VerificationError, library)
#
@@ -701,7 +704,8 @@
return ptr[0]
def setter(library, value):
ptr[0] = value
- setattr(library.__class__, name, property(getter, setter))
+ setattr(type(library), name, property(getter, setter))
+ type(library)._cffi_dir.append(name)
# ----------
diff --git a/lib_pypy/cffi/vengine_gen.py b/lib_pypy/cffi/vengine_gen.py
--- a/lib_pypy/cffi/vengine_gen.py
+++ b/lib_pypy/cffi/vengine_gen.py
@@ -74,6 +74,9 @@
class FFILibrary(types.ModuleType):
_cffi_generic_module = module
_cffi_ffi = self.ffi
+ _cffi_dir = []
+ def __dir__(self):
+ return FFILibrary._cffi_dir
library = FFILibrary("")
#
# finally, call the loaded_gen_xxx() functions. This will set
@@ -168,21 +171,22 @@
newfunction = self._load_constant(False, tp, name, module)
else:
indirections = []
- if any(isinstance(type, model.StructOrUnion) for type in tp.args):
+ if any(isinstance(typ, model.StructOrUnion) for typ in tp.args):
indirect_args = []
- for i, type in enumerate(tp.args):
- if isinstance(type, model.StructOrUnion):
- type = model.PointerType(type)
- indirections.append((i, type))
- indirect_args.append(type)
+ for i, typ in enumerate(tp.args):
+ if isinstance(typ, model.StructOrUnion):
+ typ = model.PointerType(typ)
+ indirections.append((i, typ))
+ indirect_args.append(typ)
tp = model.FunctionPtrType(tuple(indirect_args),
tp.result, tp.ellipsis)
BFunc = self.ffi._get_cached_btype(tp)
wrappername = '_cffi_f_%s' % name
newfunction = module.load_function(BFunc, wrappername)
- for i, type in indirections:
- newfunction = self._make_struct_wrapper(newfunction, i, type)
+ for i, typ in indirections:
+ newfunction = self._make_struct_wrapper(newfunction, i, typ)
setattr(library, name, newfunction)
+ type(library)._cffi_dir.append(name)
def _make_struct_wrapper(self, oldfunc, i, tp):
backend = self.ffi._backend
@@ -390,6 +394,7 @@
is_int = isinstance(tp, model.PrimitiveType) and tp.is_integer_type()
value = self._load_constant(is_int, tp, name, module)
setattr(library, name, value)
+ type(library)._cffi_dir.append(name)
# ----------
# enums
@@ -437,6 +442,7 @@
def _loaded_gen_enum(self, tp, name, module, library):
for enumerator, enumvalue in zip(tp.enumerators, tp.enumvalues):
setattr(library, enumerator, enumvalue)
+ type(library)._cffi_dir.append(enumerator)
# ----------
# macros: for now only for integers
@@ -450,6 +456,7 @@
def _loaded_gen_macro(self, tp, name, module, library):
value = self._load_constant(True, tp, name, module)
setattr(library, name, value)
+ type(library)._cffi_dir.append(name)
# ----------
# global variables
@@ -475,6 +482,7 @@
BArray = self.ffi._get_cached_btype(tp)
value = self.ffi.cast(BArray, value)
setattr(library, name, value)
+ type(library)._cffi_dir.append(name)
return
# remove ptr=<cdata 'int *'> from the library instance, and replace
# it by a property on the class, which reads/writes into ptr[0].
@@ -486,7 +494,8 @@
return ptr[0]
def setter(library, value):
ptr[0] = value
- setattr(library.__class__, name, property(getter, setter))
+ setattr(type(library), name, property(getter, setter))
+ type(library)._cffi_dir.append(name)
cffimod_header = r'''
#include <stdio.h>
diff --git a/lib_pypy/greenlet.egg-info b/lib_pypy/greenlet.egg-info
new file mode 100644
--- /dev/null
+++ b/lib_pypy/greenlet.egg-info
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: greenlet
+Version: 0.4.0
+Summary: Lightweight in-process concurrent programming
+Home-page: https://github.com/python-greenlet/greenlet
+Author: Ralf Schmitt (for CPython), PyPy team
+Author-email: pypy-dev at python.org
+License: MIT License
+Description: UNKNOWN
+Platform: UNKNOWN
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -32,11 +32,10 @@
"rctime" , "select", "zipimport", "_lsprof",
"crypt", "signal", "_rawffi", "termios", "zlib", "bz2",
"struct", "_hashlib", "_md5", "_sha", "_minimal_curses", "cStringIO",
- "thread", "itertools", "pyexpat", "_ssl", "array",
+ "thread", "itertools", "pyexpat", "_ssl", "cpyext", "array",
"binascii", "_multiprocessing", '_warnings',
"_collections", "_multibytecodec", "micronumpy", "_ffi",
- "_continuation", "_cffi_backend", "_csv"] # "cpyext", "cppyy"]
-# disabled until problems are fixed
+ "_continuation", "_cffi_backend", "_csv", "cppyy"]
))
translation_modules = default_modules.copy()
diff --git a/pypy/doc/rffi.rst b/pypy/doc/rffi.rst
--- a/pypy/doc/rffi.rst
+++ b/pypy/doc/rffi.rst
@@ -5,7 +5,7 @@
Purpose
-------
-This document describes an FFI for RPython language, concentrating
+This document describes an FFI for the RPython language, concentrating
on low-level backends like C. It describes
how to declare and call low-level (C) functions from RPython level.
@@ -50,7 +50,7 @@
------
In rffi_ there are various declared types for C-structures, like CCHARP
-(char*), SIZE_T (size_t) and others. refer to file for details.
+(char*), SIZE_T (size_t) and others. Refer to file for details.
Instances of non-primitive types must be alloced by hand, with call
to lltype.malloc, and freed by lltype.free both with keyword argument
flavor='raw'. There are several helpers like string -> char*
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -34,3 +34,15 @@
.. branch: remove-iter-smm
Remove multi-methods on iterators
+
+.. branch: emit-call-x86
+.. branch: emit-call-arm
+
+.. branch: on-abort-resops
+Added list of resops to the pypyjit on_abort hook.
+
+.. branch: logging-perf
+Speeds up the stdlib logging module
+
+.. branch: operrfmt-NT
+Adds a couple convenient format specifiers to operationerrfmt
diff --git a/pypy/interpreter/argument.py b/pypy/interpreter/argument.py
--- a/pypy/interpreter/argument.py
+++ b/pypy/interpreter/argument.py
@@ -86,12 +86,9 @@
args_w = space.fixedview(w_stararg)
except OperationError, e:
if e.match(space, space.w_TypeError):
- w_type = space.type(w_stararg)
- typename = w_type.getname(space)
- raise OperationError(
+ raise operationerrfmt(
space.w_TypeError,
- space.wrap("argument after * must be "
- "a sequence, not %s" % (typename,)))
+ "argument after * must be a sequence, not %T", w_stararg)
raise
self.arguments_w = self.arguments_w + args_w
@@ -116,12 +113,10 @@
w_keys = space.call_method(w_starstararg, "keys")
except OperationError, e:
if e.match(space, space.w_AttributeError):
- w_type = space.type(w_starstararg)
- typename = w_type.getname(space)
- raise OperationError(
+ raise operationerrfmt(
space.w_TypeError,
- space.wrap("argument after ** must be "
- "a mapping, not %s" % (typename,)))
+ "argument after ** must be a mapping, not %T",
+ w_starstararg)
raise
keys_w = space.unpackiterable(w_keys)
keywords_w = [None] * len(keys_w)
diff --git a/pypy/interpreter/astcompiler/ast.py b/pypy/interpreter/astcompiler/ast.py
--- a/pypy/interpreter/astcompiler/ast.py
+++ b/pypy/interpreter/astcompiler/ast.py
@@ -2793,8 +2793,7 @@
def Module_get_body(space, w_self):
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -2835,8 +2834,7 @@
def Interactive_get_body(space, w_self):
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -2881,8 +2879,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
return space.wrap(w_self.body)
def Expression_set_body(space, w_self, w_new_value):
@@ -2925,8 +2922,7 @@
def Suite_get_body(space, w_self):
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -2971,8 +2967,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'lineno')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'lineno')
return space.wrap(w_self.lineno)
def stmt_set_lineno(space, w_self, w_new_value):
@@ -2993,8 +2988,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 2:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'col_offset')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'col_offset')
return space.wrap(w_self.col_offset)
def stmt_set_col_offset(space, w_self, w_new_value):
@@ -3024,8 +3018,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'name')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'name')
return space.wrap(w_self.name)
def FunctionDef_set_name(space, w_self, w_new_value):
@@ -3046,8 +3039,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'args')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'args')
return space.wrap(w_self.args)
def FunctionDef_set_args(space, w_self, w_new_value):
@@ -3064,8 +3056,7 @@
def FunctionDef_get_body(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -3081,8 +3072,7 @@
def FunctionDef_get_decorator_list(space, w_self):
if not w_self.initialization_state & 32:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'decorator_list')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'decorator_list')
if w_self.w_decorator_list is None:
if w_self.decorator_list is None:
list_w = []
@@ -3131,8 +3121,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'name')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'name')
return space.wrap(w_self.name)
def ClassDef_set_name(space, w_self, w_new_value):
@@ -3149,8 +3138,7 @@
def ClassDef_get_bases(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'bases')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'bases')
if w_self.w_bases is None:
if w_self.bases is None:
list_w = []
@@ -3166,8 +3154,7 @@
def ClassDef_get_body(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -3183,8 +3170,7 @@
def ClassDef_get_decorator_list(space, w_self):
if not w_self.initialization_state & 32:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'decorator_list')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'decorator_list')
if w_self.w_decorator_list is None:
if w_self.decorator_list is None:
list_w = []
@@ -3234,8 +3220,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def Return_set_value(space, w_self, w_new_value):
@@ -3278,8 +3263,7 @@
def Delete_get_targets(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'targets')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'targets')
if w_self.w_targets is None:
if w_self.targets is None:
list_w = []
@@ -3320,8 +3304,7 @@
def Assign_get_targets(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'targets')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'targets')
if w_self.w_targets is None:
if w_self.targets is None:
list_w = []
@@ -3341,8 +3324,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def Assign_set_value(space, w_self, w_new_value):
@@ -3391,8 +3373,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'target')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'target')
return space.wrap(w_self.target)
def AugAssign_set_target(space, w_self, w_new_value):
@@ -3415,8 +3396,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'op')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'op')
return operator_to_class[w_self.op - 1]()
def AugAssign_set_op(space, w_self, w_new_value):
@@ -3439,8 +3419,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def AugAssign_set_value(space, w_self, w_new_value):
@@ -3489,8 +3468,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'dest')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'dest')
return space.wrap(w_self.dest)
def Print_set_dest(space, w_self, w_new_value):
@@ -3509,8 +3487,7 @@
def Print_get_values(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'values')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'values')
if w_self.w_values is None:
if w_self.values is None:
list_w = []
@@ -3530,8 +3507,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'nl')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'nl')
return space.wrap(w_self.nl)
def Print_set_nl(space, w_self, w_new_value):
@@ -3579,8 +3555,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'target')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'target')
return space.wrap(w_self.target)
def For_set_target(space, w_self, w_new_value):
@@ -3603,8 +3578,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'iter')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'iter')
return space.wrap(w_self.iter)
def For_set_iter(space, w_self, w_new_value):
@@ -3623,8 +3597,7 @@
def For_get_body(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -3640,8 +3613,7 @@
def For_get_orelse(space, w_self):
if not w_self.initialization_state & 32:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'orelse')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'orelse')
if w_self.w_orelse is None:
if w_self.orelse is None:
list_w = []
@@ -3690,8 +3662,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'test')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'test')
return space.wrap(w_self.test)
def While_set_test(space, w_self, w_new_value):
@@ -3710,8 +3681,7 @@
def While_get_body(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -3727,8 +3697,7 @@
def While_get_orelse(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'orelse')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'orelse')
if w_self.w_orelse is None:
if w_self.orelse is None:
list_w = []
@@ -3776,8 +3745,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'test')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'test')
return space.wrap(w_self.test)
def If_set_test(space, w_self, w_new_value):
@@ -3796,8 +3764,7 @@
def If_get_body(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -3813,8 +3780,7 @@
def If_get_orelse(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'orelse')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'orelse')
if w_self.w_orelse is None:
if w_self.orelse is None:
list_w = []
@@ -3862,8 +3828,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'context_expr')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'context_expr')
return space.wrap(w_self.context_expr)
def With_set_context_expr(space, w_self, w_new_value):
@@ -3886,8 +3851,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'optional_vars')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'optional_vars')
return space.wrap(w_self.optional_vars)
def With_set_optional_vars(space, w_self, w_new_value):
@@ -3906,8 +3870,7 @@
def With_get_body(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -3954,8 +3917,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'type')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'type')
return space.wrap(w_self.type)
def Raise_set_type(space, w_self, w_new_value):
@@ -3978,8 +3940,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'inst')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'inst')
return space.wrap(w_self.inst)
def Raise_set_inst(space, w_self, w_new_value):
@@ -4002,8 +3963,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'tback')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'tback')
return space.wrap(w_self.tback)
def Raise_set_tback(space, w_self, w_new_value):
@@ -4048,8 +4008,7 @@
def TryExcept_get_body(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -4065,8 +4024,7 @@
def TryExcept_get_handlers(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'handlers')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'handlers')
if w_self.w_handlers is None:
if w_self.handlers is None:
list_w = []
@@ -4082,8 +4040,7 @@
def TryExcept_get_orelse(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'orelse')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'orelse')
if w_self.w_orelse is None:
if w_self.orelse is None:
list_w = []
@@ -4128,8 +4085,7 @@
def TryFinally_get_body(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -4145,8 +4101,7 @@
def TryFinally_get_finalbody(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'finalbody')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'finalbody')
if w_self.w_finalbody is None:
if w_self.finalbody is None:
list_w = []
@@ -4193,8 +4148,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'test')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'test')
return space.wrap(w_self.test)
def Assert_set_test(space, w_self, w_new_value):
@@ -4217,8 +4171,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'msg')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'msg')
return space.wrap(w_self.msg)
def Assert_set_msg(space, w_self, w_new_value):
@@ -4262,8 +4215,7 @@
def Import_get_names(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'names')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'names')
if w_self.w_names is None:
if w_self.names is None:
list_w = []
@@ -4308,8 +4260,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'module')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'module')
return space.wrap(w_self.module)
def ImportFrom_set_module(space, w_self, w_new_value):
@@ -4329,8 +4280,7 @@
def ImportFrom_get_names(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'names')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'names')
if w_self.w_names is None:
if w_self.names is None:
list_w = []
@@ -4350,8 +4300,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'level')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'level')
return space.wrap(w_self.level)
def ImportFrom_set_level(space, w_self, w_new_value):
@@ -4399,8 +4348,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
return space.wrap(w_self.body)
def Exec_set_body(space, w_self, w_new_value):
@@ -4423,8 +4371,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'globals')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'globals')
return space.wrap(w_self.globals)
def Exec_set_globals(space, w_self, w_new_value):
@@ -4447,8 +4394,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'locals')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'locals')
return space.wrap(w_self.locals)
def Exec_set_locals(space, w_self, w_new_value):
@@ -4493,8 +4439,7 @@
def Global_get_names(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'names')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'names')
if w_self.w_names is None:
if w_self.names is None:
list_w = []
@@ -4539,8 +4484,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def Expr_set_value(space, w_self, w_new_value):
@@ -4638,8 +4582,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'lineno')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'lineno')
return space.wrap(w_self.lineno)
def expr_set_lineno(space, w_self, w_new_value):
@@ -4660,8 +4603,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 2:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'col_offset')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'col_offset')
return space.wrap(w_self.col_offset)
def expr_set_col_offset(space, w_self, w_new_value):
@@ -4691,8 +4633,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'op')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'op')
return boolop_to_class[w_self.op - 1]()
def BoolOp_set_op(space, w_self, w_new_value):
@@ -4711,8 +4652,7 @@
def BoolOp_get_values(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'values')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'values')
if w_self.w_values is None:
if w_self.values is None:
list_w = []
@@ -4758,8 +4698,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'left')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'left')
return space.wrap(w_self.left)
def BinOp_set_left(space, w_self, w_new_value):
@@ -4782,8 +4721,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'op')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'op')
return operator_to_class[w_self.op - 1]()
def BinOp_set_op(space, w_self, w_new_value):
@@ -4806,8 +4744,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'right')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'right')
return space.wrap(w_self.right)
def BinOp_set_right(space, w_self, w_new_value):
@@ -4856,8 +4793,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'op')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'op')
return unaryop_to_class[w_self.op - 1]()
def UnaryOp_set_op(space, w_self, w_new_value):
@@ -4880,8 +4816,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'operand')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'operand')
return space.wrap(w_self.operand)
def UnaryOp_set_operand(space, w_self, w_new_value):
@@ -4929,8 +4864,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'args')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'args')
return space.wrap(w_self.args)
def Lambda_set_args(space, w_self, w_new_value):
@@ -4951,8 +4885,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
return space.wrap(w_self.body)
def Lambda_set_body(space, w_self, w_new_value):
@@ -5000,8 +4933,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'test')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'test')
return space.wrap(w_self.test)
def IfExp_set_test(space, w_self, w_new_value):
@@ -5024,8 +4956,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
return space.wrap(w_self.body)
def IfExp_set_body(space, w_self, w_new_value):
@@ -5048,8 +4979,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'orelse')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'orelse')
return space.wrap(w_self.orelse)
def IfExp_set_orelse(space, w_self, w_new_value):
@@ -5094,8 +5024,7 @@
def Dict_get_keys(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'keys')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'keys')
if w_self.w_keys is None:
if w_self.keys is None:
list_w = []
@@ -5111,8 +5040,7 @@
def Dict_get_values(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'values')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'values')
if w_self.w_values is None:
if w_self.values is None:
list_w = []
@@ -5155,8 +5083,7 @@
def Set_get_elts(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'elts')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'elts')
if w_self.w_elts is None:
if w_self.elts is None:
list_w = []
@@ -5201,8 +5128,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'elt')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'elt')
return space.wrap(w_self.elt)
def ListComp_set_elt(space, w_self, w_new_value):
@@ -5221,8 +5147,7 @@
def ListComp_get_generators(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'generators')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'generators')
if w_self.w_generators is None:
if w_self.generators is None:
list_w = []
@@ -5268,8 +5193,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'elt')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'elt')
return space.wrap(w_self.elt)
def SetComp_set_elt(space, w_self, w_new_value):
@@ -5288,8 +5212,7 @@
def SetComp_get_generators(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'generators')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'generators')
if w_self.w_generators is None:
if w_self.generators is None:
list_w = []
@@ -5335,8 +5258,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'key')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'key')
return space.wrap(w_self.key)
def DictComp_set_key(space, w_self, w_new_value):
@@ -5359,8 +5281,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def DictComp_set_value(space, w_self, w_new_value):
@@ -5379,8 +5300,7 @@
def DictComp_get_generators(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'generators')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'generators')
if w_self.w_generators is None:
if w_self.generators is None:
list_w = []
@@ -5427,8 +5347,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'elt')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'elt')
return space.wrap(w_self.elt)
def GeneratorExp_set_elt(space, w_self, w_new_value):
@@ -5447,8 +5366,7 @@
def GeneratorExp_get_generators(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'generators')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'generators')
if w_self.w_generators is None:
if w_self.generators is None:
list_w = []
@@ -5494,8 +5412,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def Yield_set_value(space, w_self, w_new_value):
@@ -5542,8 +5459,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'left')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'left')
return space.wrap(w_self.left)
def Compare_set_left(space, w_self, w_new_value):
@@ -5562,8 +5478,7 @@
def Compare_get_ops(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'ops')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'ops')
if w_self.w_ops is None:
if w_self.ops is None:
list_w = []
@@ -5579,8 +5494,7 @@
def Compare_get_comparators(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'comparators')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'comparators')
if w_self.w_comparators is None:
if w_self.comparators is None:
list_w = []
@@ -5628,8 +5542,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'func')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'func')
return space.wrap(w_self.func)
def Call_set_func(space, w_self, w_new_value):
@@ -5648,8 +5561,7 @@
def Call_get_args(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'args')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'args')
if w_self.w_args is None:
if w_self.args is None:
list_w = []
@@ -5665,8 +5577,7 @@
def Call_get_keywords(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'keywords')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'keywords')
if w_self.w_keywords is None:
if w_self.keywords is None:
list_w = []
@@ -5686,8 +5597,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 32:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'starargs')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'starargs')
return space.wrap(w_self.starargs)
def Call_set_starargs(space, w_self, w_new_value):
@@ -5710,8 +5620,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 64:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'kwargs')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'kwargs')
return space.wrap(w_self.kwargs)
def Call_set_kwargs(space, w_self, w_new_value):
@@ -5764,8 +5673,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def Repr_set_value(space, w_self, w_new_value):
@@ -5812,8 +5720,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'n')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'n')
return w_self.n
def Num_set_n(space, w_self, w_new_value):
@@ -5858,8 +5765,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 's')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 's')
return w_self.s
def Str_set_s(space, w_self, w_new_value):
@@ -5904,8 +5810,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def Attribute_set_value(space, w_self, w_new_value):
@@ -5928,8 +5833,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'attr')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'attr')
return space.wrap(w_self.attr)
def Attribute_set_attr(space, w_self, w_new_value):
@@ -5950,8 +5854,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'ctx')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'ctx')
return expr_context_to_class[w_self.ctx - 1]()
def Attribute_set_ctx(space, w_self, w_new_value):
@@ -6000,8 +5903,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def Subscript_set_value(space, w_self, w_new_value):
@@ -6024,8 +5926,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'slice')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'slice')
return space.wrap(w_self.slice)
def Subscript_set_slice(space, w_self, w_new_value):
@@ -6048,8 +5949,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'ctx')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'ctx')
return expr_context_to_class[w_self.ctx - 1]()
def Subscript_set_ctx(space, w_self, w_new_value):
@@ -6098,8 +5998,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'id')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'id')
return space.wrap(w_self.id)
def Name_set_id(space, w_self, w_new_value):
@@ -6120,8 +6019,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'ctx')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'ctx')
return expr_context_to_class[w_self.ctx - 1]()
def Name_set_ctx(space, w_self, w_new_value):
@@ -6165,8 +6063,7 @@
def List_get_elts(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'elts')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'elts')
if w_self.w_elts is None:
if w_self.elts is None:
list_w = []
@@ -6186,8 +6083,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'ctx')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'ctx')
return expr_context_to_class[w_self.ctx - 1]()
def List_set_ctx(space, w_self, w_new_value):
@@ -6232,8 +6128,7 @@
def Tuple_get_elts(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'elts')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'elts')
if w_self.w_elts is None:
if w_self.elts is None:
list_w = []
@@ -6253,8 +6148,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'ctx')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'ctx')
return expr_context_to_class[w_self.ctx - 1]()
def Tuple_set_ctx(space, w_self, w_new_value):
@@ -6303,8 +6197,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return w_self.value
def Const_set_value(space, w_self, w_new_value):
@@ -6422,8 +6315,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'lower')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'lower')
return space.wrap(w_self.lower)
def Slice_set_lower(space, w_self, w_new_value):
@@ -6446,8 +6338,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 2:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'upper')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'upper')
return space.wrap(w_self.upper)
def Slice_set_upper(space, w_self, w_new_value):
@@ -6470,8 +6361,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'step')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'step')
return space.wrap(w_self.step)
def Slice_set_step(space, w_self, w_new_value):
@@ -6516,8 +6406,7 @@
def ExtSlice_get_dims(space, w_self):
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'dims')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'dims')
if w_self.w_dims is None:
if w_self.dims is None:
list_w = []
@@ -6562,8 +6451,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def Index_set_value(space, w_self, w_new_value):
@@ -6834,8 +6722,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'target')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'target')
return space.wrap(w_self.target)
def comprehension_set_target(space, w_self, w_new_value):
@@ -6858,8 +6745,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 2:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'iter')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'iter')
return space.wrap(w_self.iter)
def comprehension_set_iter(space, w_self, w_new_value):
@@ -6878,8 +6764,7 @@
def comprehension_get_ifs(space, w_self):
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'ifs')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'ifs')
if w_self.w_ifs is None:
if w_self.ifs is None:
list_w = []
@@ -6926,8 +6811,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'lineno')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'lineno')
return space.wrap(w_self.lineno)
def excepthandler_set_lineno(space, w_self, w_new_value):
@@ -6948,8 +6832,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 2:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'col_offset')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'col_offset')
return space.wrap(w_self.col_offset)
def excepthandler_set_col_offset(space, w_self, w_new_value):
@@ -6979,8 +6862,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'type')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'type')
return space.wrap(w_self.type)
def ExceptHandler_set_type(space, w_self, w_new_value):
@@ -7003,8 +6885,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'name')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'name')
return space.wrap(w_self.name)
def ExceptHandler_set_name(space, w_self, w_new_value):
@@ -7023,8 +6904,7 @@
def ExceptHandler_get_body(space, w_self):
if not w_self.initialization_state & 16:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'body')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'body')
if w_self.w_body is None:
if w_self.body is None:
list_w = []
@@ -7067,8 +6947,7 @@
def arguments_get_args(space, w_self):
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'args')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'args')
if w_self.w_args is None:
if w_self.args is None:
list_w = []
@@ -7088,8 +6967,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 2:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'vararg')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'vararg')
return space.wrap(w_self.vararg)
def arguments_set_vararg(space, w_self, w_new_value):
@@ -7113,8 +6991,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 4:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'kwarg')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'kwarg')
return space.wrap(w_self.kwarg)
def arguments_set_kwarg(space, w_self, w_new_value):
@@ -7134,8 +7011,7 @@
def arguments_get_defaults(space, w_self):
if not w_self.initialization_state & 8:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'defaults')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'defaults')
if w_self.w_defaults is None:
if w_self.defaults is None:
list_w = []
@@ -7184,8 +7060,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'arg')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'arg')
return space.wrap(w_self.arg)
def keyword_set_arg(space, w_self, w_new_value):
@@ -7206,8 +7081,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 2:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'value')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'value')
return space.wrap(w_self.value)
def keyword_set_value(space, w_self, w_new_value):
@@ -7255,8 +7129,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 1:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'name')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'name')
return space.wrap(w_self.name)
def alias_set_name(space, w_self, w_new_value):
@@ -7277,8 +7150,7 @@
if w_obj is not None:
return w_obj
if not w_self.initialization_state & 2:
- typename = space.type(w_self).getname(space)
- raise operationerrfmt(space.w_AttributeError, "'%s' object has no attribute '%s'", typename, 'asname')
+ raise operationerrfmt(space.w_AttributeError, "'%T' object has no attribute '%s'", w_self, 'asname')
return space.wrap(w_self.asname)
def alias_set_asname(space, w_self, w_new_value):
diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -11,7 +11,6 @@
from pypy.interpreter.astcompiler import optimize # For side effects
from pypy.interpreter.pyparser.error import SyntaxError
from pypy.tool import stdlib_opcode as ops
-from pypy.interpreter.error import OperationError
def compile_ast(space, module, info):
@@ -21,91 +20,91 @@
name_ops_default = misc.dict_to_switch({
- ast.Load : ops.LOAD_NAME,
- ast.Store : ops.STORE_NAME,
- ast.Del : ops.DELETE_NAME
+ ast.Load: ops.LOAD_NAME,
+ ast.Store: ops.STORE_NAME,
+ ast.Del: ops.DELETE_NAME
})
name_ops_fast = misc.dict_to_switch({
- ast.Load : ops.LOAD_FAST,
- ast.Store : ops.STORE_FAST,
- ast.Del : ops.DELETE_FAST
+ ast.Load: ops.LOAD_FAST,
+ ast.Store: ops.STORE_FAST,
+ ast.Del: ops.DELETE_FAST
})
name_ops_deref = misc.dict_to_switch({
- ast.Load : ops.LOAD_DEREF,
- ast.Store : ops.STORE_DEREF,
+ ast.Load: ops.LOAD_DEREF,
+ ast.Store: ops.STORE_DEREF,
})
name_ops_global = misc.dict_to_switch({
- ast.Load : ops.LOAD_GLOBAL,
- ast.Store : ops.STORE_GLOBAL,
- ast.Del : ops.DELETE_GLOBAL
+ ast.Load: ops.LOAD_GLOBAL,
+ ast.Store: ops.STORE_GLOBAL,
+ ast.Del: ops.DELETE_GLOBAL
})
unary_operations = misc.dict_to_switch({
- ast.Invert : ops.UNARY_INVERT,
- ast.Not : ops.UNARY_NOT,
- ast.UAdd : ops.UNARY_POSITIVE,
- ast.USub : ops.UNARY_NEGATIVE
+ ast.Invert: ops.UNARY_INVERT,
+ ast.Not: ops.UNARY_NOT,
+ ast.UAdd: ops.UNARY_POSITIVE,
+ ast.USub: ops.UNARY_NEGATIVE
})
binary_operations = misc.dict_to_switch({
- ast.Add : ops.BINARY_ADD,
- ast.Sub : ops.BINARY_SUBTRACT,
- ast.Mult : ops.BINARY_MULTIPLY,
- ast.Mod : ops.BINARY_MODULO,
- ast.Pow : ops.BINARY_POWER,
- ast.LShift : ops.BINARY_LSHIFT,
- ast.RShift : ops.BINARY_RSHIFT,
- ast.BitOr : ops.BINARY_OR,
- ast.BitAnd : ops.BINARY_AND,
- ast.BitXor : ops.BINARY_XOR,
- ast.FloorDiv : ops.BINARY_FLOOR_DIVIDE
+ ast.Add: ops.BINARY_ADD,
+ ast.Sub: ops.BINARY_SUBTRACT,
+ ast.Mult: ops.BINARY_MULTIPLY,
+ ast.Mod: ops.BINARY_MODULO,
+ ast.Pow: ops.BINARY_POWER,
+ ast.LShift: ops.BINARY_LSHIFT,
+ ast.RShift: ops.BINARY_RSHIFT,
+ ast.BitOr: ops.BINARY_OR,
+ ast.BitAnd: ops.BINARY_AND,
+ ast.BitXor: ops.BINARY_XOR,
+ ast.FloorDiv: ops.BINARY_FLOOR_DIVIDE
})
inplace_operations = misc.dict_to_switch({
- ast.Add : ops.INPLACE_ADD,
- ast.Sub : ops.INPLACE_SUBTRACT,
- ast.Mult : ops.INPLACE_MULTIPLY,
- ast.Mod : ops.INPLACE_MODULO,
- ast.Pow : ops.INPLACE_POWER,
- ast.LShift : ops.INPLACE_LSHIFT,
- ast.RShift : ops.INPLACE_RSHIFT,
- ast.BitOr : ops.INPLACE_OR,
- ast.BitAnd : ops.INPLACE_AND,
- ast.BitXor : ops.INPLACE_XOR,
- ast.FloorDiv : ops.INPLACE_FLOOR_DIVIDE
+ ast.Add: ops.INPLACE_ADD,
+ ast.Sub: ops.INPLACE_SUBTRACT,
+ ast.Mult: ops.INPLACE_MULTIPLY,
+ ast.Mod: ops.INPLACE_MODULO,
+ ast.Pow: ops.INPLACE_POWER,
+ ast.LShift: ops.INPLACE_LSHIFT,
+ ast.RShift: ops.INPLACE_RSHIFT,
+ ast.BitOr: ops.INPLACE_OR,
+ ast.BitAnd: ops.INPLACE_AND,
+ ast.BitXor: ops.INPLACE_XOR,
+ ast.FloorDiv: ops.INPLACE_FLOOR_DIVIDE
})
compare_operations = misc.dict_to_switch({
- ast.Eq : 2,
- ast.NotEq : 3,
- ast.Lt : 0,
- ast.LtE : 1,
- ast.Gt : 4,
- ast.GtE : 5,
- ast.In : 6,
- ast.NotIn : 7,
- ast.Is : 8,
- ast.IsNot : 9
+ ast.Eq: 2,
+ ast.NotEq: 3,
+ ast.Lt: 0,
+ ast.LtE: 1,
+ ast.Gt: 4,
+ ast.GtE: 5,
+ ast.In: 6,
+ ast.NotIn: 7,
+ ast.Is: 8,
+ ast.IsNot: 9
})
subscr_operations = misc.dict_to_switch({
- ast.AugLoad : ops.BINARY_SUBSCR,
- ast.Load : ops.BINARY_SUBSCR,
- ast.AugStore : ops.STORE_SUBSCR,
- ast.Store : ops.STORE_SUBSCR,
- ast.Del : ops.DELETE_SUBSCR
+ ast.AugLoad: ops.BINARY_SUBSCR,
+ ast.Load: ops.BINARY_SUBSCR,
+ ast.AugStore: ops.STORE_SUBSCR,
+ ast.Store: ops.STORE_SUBSCR,
+ ast.Del: ops.DELETE_SUBSCR
})
slice_operations = misc.dict_to_switch({
- ast.AugLoad : ops.SLICE,
- ast.Load : ops.SLICE,
More information about the pypy-commit
mailing list