Author: Brian Kearns <[email protected]>
Branch:
Changeset: r73420:29beaf084002
Date: 2014-09-10 15:31 -0400
http://bitbucket.org/pypy/pypy/changeset/29beaf084002/
Log: cleanup
diff --git a/rpython/annotator/builtin.py b/rpython/annotator/builtin.py
--- a/rpython/annotator/builtin.py
+++ b/rpython/annotator/builtin.py
@@ -255,6 +255,11 @@
BUILTIN_ANALYZERS[original] = value
+@analyzer_for(getattr(object.__init__, 'im_func', object.__init__))
+def object_init(s_self, *args):
+ # ignore - mostly used for abstract classes initialization
+ pass
+
@analyzer_for(getattr(EnvironmentError.__init__, 'im_func',
EnvironmentError.__init__))
def EnvironmentError_init(s_self, *args):
pass
@@ -268,11 +273,6 @@
def WindowsError_init(s_self, *args):
pass
-@analyzer_for(getattr(object.__init__, 'im_func', object.__init__))
-def object_init(s_self, *args):
- # ignore - mostly used for abstract classes initialization
- pass
-
@analyzer_for(sys.getdefaultencoding)
def conf():
diff --git a/rpython/annotator/classdef.py b/rpython/annotator/classdef.py
--- a/rpython/annotator/classdef.py
+++ b/rpython/annotator/classdef.py
@@ -438,7 +438,9 @@
# ____________________________________________________________
FORCE_ATTRIBUTES_INTO_CLASSES = {
- EnvironmentError: {'errno': SomeInteger(), 'strerror':
SomeString(can_be_None=True), 'filename': SomeString(can_be_None=True)},
+ EnvironmentError: {'errno': SomeInteger(),
+ 'strerror': SomeString(can_be_None=True),
+ 'filename': SomeString(can_be_None=True)},
}
try:
@@ -455,4 +457,3 @@
else:
FORCE_ATTRIBUTES_INTO_CLASSES[termios.error] = \
{'args': SomeTuple([SomeInteger(), SomeString()])}
-
diff --git a/rpython/rtyper/rbuiltin.py b/rpython/rtyper/rbuiltin.py
--- a/rpython/rtyper/rbuiltin.py
+++ b/rpython/rtyper/rbuiltin.py
@@ -259,9 +259,6 @@
return i1
return i2
-def rtype_Exception__init__(hop):
- hop.exception_cannot_occur()
-
def rtype_object__init__(hop):
hop.exception_cannot_occur()
@@ -341,6 +338,9 @@
original = getattr(__builtin__, name[14:])
BUILTIN_TYPER[original] = value
+BUILTIN_TYPER[getattr(object.__init__, 'im_func', object.__init__)] = (
+ rtype_object__init__)
+
BUILTIN_TYPER[getattr(EnvironmentError.__init__, 'im_func',
EnvironmentError.__init__)] = (
rtype_EnvironmentError__init__)
@@ -353,8 +353,6 @@
getattr(WindowsError.__init__, 'im_func', WindowsError.__init__)] = (
rtype_WindowsError__init__)
-BUILTIN_TYPER[getattr(object.__init__, 'im_func', object.__init__)] = (
- rtype_object__init__)
# annotation of low-level types
def rtype_malloc(hop, i_flavor=None, i_zero=None, i_track_allocation=None,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
