[pypy-commit] pypy default: cleanups in rpython.rlib
bdkearns
noreply at buildbot.pypy.org
Fri Mar 22 11:00:21 CET 2013
Author: Brian Kearns <bdkearns at gmail.com>
Branch:
Changeset: r62648:aedad688feca
Date: 2013-03-22 02:29 -0400
http://bitbucket.org/pypy/pypy/changeset/aedad688feca/
Log: cleanups in rpython.rlib
diff --git a/rpython/rlib/_jit_vref.py b/rpython/rlib/_jit_vref.py
--- a/rpython/rlib/_jit_vref.py
+++ b/rpython/rlib/_jit_vref.py
@@ -1,9 +1,7 @@
from rpython.annotator import model as annmodel
from rpython.tool.pairtype import pairtype
-from rpython.rtyper.extregistry import ExtRegistryEntry
from rpython.rtyper.rclass import getinstancerepr
from rpython.rtyper.rmodel import Repr
-from rpython.rtyper.lltypesystem.lloperation import llop
from rpython.rtyper.lltypesystem.rclass import OBJECTPTR
from rpython.rtyper.lltypesystem import lltype
from rpython.rtyper.error import TyperError
diff --git a/rpython/rlib/_rffi_stacklet.py b/rpython/rlib/_rffi_stacklet.py
--- a/rpython/rlib/_rffi_stacklet.py
+++ b/rpython/rlib/_rffi_stacklet.py
@@ -4,7 +4,6 @@
from rpython.rtyper.tool import rffi_platform
from rpython.rlib.rarithmetic import is_emulated_long
from rpython.conftest import cdir
-import sys
cdir = py.path.local(cdir)
diff --git a/rpython/rlib/_rsocket_rffi.py b/rpython/rlib/_rsocket_rffi.py
--- a/rpython/rlib/_rsocket_rffi.py
+++ b/rpython/rlib/_rsocket_rffi.py
@@ -3,7 +3,6 @@
from rpython.rtyper.lltypesystem import lltype
from rpython.rtyper.tool import rffi_platform as platform
from rpython.rtyper.lltypesystem.rffi import CCHARP
-from rpython.rlib.rposix import get_errno as geterrno
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import platform as target_platform
@@ -635,6 +634,8 @@
def gai_strerror_str(errno):
return rwin32.FormatError(errno)
else:
+ from rpython.rlib.rposix import get_errno as geterrno
+
socket_strerror_str = os.strerror
def gai_strerror_str(errno):
return rffi.charp2str(gai_strerror(errno))
diff --git a/rpython/rlib/_rweakkeydict.py b/rpython/rlib/_rweakkeydict.py
--- a/rpython/rlib/_rweakkeydict.py
+++ b/rpython/rlib/_rweakkeydict.py
@@ -1,13 +1,11 @@
from rpython.flowspace.model import Constant
from rpython.rtyper.lltypesystem import lltype, llmemory, rclass, rdict
from rpython.rtyper.lltypesystem.llmemory import weakref_create, weakref_deref
-from rpython.rtyper.lltypesystem.lloperation import llop
from rpython.rtyper.rclass import getinstancerepr
from rpython.rtyper.rmodel import Repr
from rpython.rlib.rweakref import RWeakKeyDictionary
from rpython.rlib import jit
from rpython.rlib.objectmodel import compute_identity_hash
-from rpython.rlib.objectmodel import we_are_translated
# Warning: this implementation of RWeakKeyDictionary is not exactly
diff --git a/rpython/rlib/_rweakvaldict.py b/rpython/rlib/_rweakvaldict.py
--- a/rpython/rlib/_rweakvaldict.py
+++ b/rpython/rlib/_rweakvaldict.py
@@ -1,9 +1,7 @@
from rpython.flowspace.model import Constant
-from rpython.rtyper.lltypesystem import lltype, llmemory, rstr, rclass, rdict
+from rpython.rtyper.lltypesystem import lltype, llmemory, rclass, rdict
from rpython.rtyper.lltypesystem.llmemory import weakref_create, weakref_deref
-from rpython.rtyper.lltypesystem.lloperation import llop
from rpython.rtyper.rclass import getinstancerepr
-from rpython.rtyper.rint import signed_repr
from rpython.rtyper.rmodel import Repr
from rpython.rlib.rweakref import RWeakValueDictionary
from rpython.rlib import jit
diff --git a/rpython/rlib/clibffi.py b/rpython/rlib/clibffi.py
--- a/rpython/rlib/clibffi.py
+++ b/rpython/rlib/clibffi.py
@@ -5,7 +5,7 @@
from rpython.rtyper.tool import rffi_platform
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rlib.unroll import unrolling_iterable
-from rpython.rlib.rarithmetic import intmask, r_uint, is_emulated_long
+from rpython.rlib.rarithmetic import intmask, is_emulated_long
from rpython.rlib.objectmodel import we_are_translated
from rpython.rlib.rmmap import alloc
from rpython.rlib.rdynload import dlopen, dlclose, dlsym, dlsym_byordinal
diff --git a/rpython/rlib/debug.py b/rpython/rlib/debug.py
--- a/rpython/rlib/debug.py
+++ b/rpython/rlib/debug.py
@@ -296,7 +296,7 @@
_about_ = mark_dict_non_null
def compute_result_annotation(self, s_dict):
- from rpython.annotator.model import SomeDict, s_None
+ from rpython.annotator.model import SomeDict
assert isinstance(s_dict, SomeDict)
s_dict.dictdef.force_non_null = True
diff --git a/rpython/rlib/jit_hooks.py b/rpython/rlib/jit_hooks.py
--- a/rpython/rlib/jit_hooks.py
+++ b/rpython/rlib/jit_hooks.py
@@ -4,7 +4,7 @@
from rpython.rtyper.lltypesystem import llmemory, lltype
from rpython.rtyper.lltypesystem import rclass
from rpython.rtyper.annlowlevel import cast_instance_to_base_ptr,\
- cast_base_ptr_to_instance, llstr, hlstr
+ cast_base_ptr_to_instance, llstr
from rpython.rlib.objectmodel import specialize
def register_helper(s_result):
diff --git a/rpython/rlib/objectmodel.py b/rpython/rlib/objectmodel.py
--- a/rpython/rlib/objectmodel.py
+++ b/rpython/rlib/objectmodel.py
@@ -5,7 +5,6 @@
from __future__ import absolute_import
-import py
import sys
import types
import math
diff --git a/rpython/rlib/rbigint.py b/rpython/rlib/rbigint.py
--- a/rpython/rlib/rbigint.py
+++ b/rpython/rlib/rbigint.py
@@ -1,5 +1,5 @@
-from rpython.rlib.rarithmetic import LONG_BIT, intmask, longlongmask, r_uint, r_ulonglong, r_longlonglong
-from rpython.rlib.rarithmetic import ovfcheck, r_longlong, widen, is_valid_int
+from rpython.rlib.rarithmetic import LONG_BIT, intmask, longlongmask, r_uint, r_ulonglong
+from rpython.rlib.rarithmetic import ovfcheck, r_longlong, widen
from rpython.rlib.rarithmetic import most_neg_value_of_same_type
from rpython.rlib.rfloat import isinf, isnan
from rpython.rlib.rstring import StringBuilder
diff --git a/rpython/rlib/rcomplex.py b/rpython/rlib/rcomplex.py
--- a/rpython/rlib/rcomplex.py
+++ b/rpython/rlib/rcomplex.py
@@ -1,5 +1,5 @@
import math
-from math import fabs, pi, e
+from math import fabs
from rpython.rlib.rfloat import copysign, asinh, log1p, isfinite, isinf, isnan
from rpython.rlib.constant import DBL_MIN, CM_SCALE_UP, CM_SCALE_DOWN
from rpython.rlib.constant import CM_LARGE_DOUBLE, DBL_MANT_DIG
diff --git a/rpython/rlib/rdynload.py b/rpython/rlib/rdynload.py
--- a/rpython/rlib/rdynload.py
+++ b/rpython/rlib/rdynload.py
@@ -119,7 +119,7 @@
# Never called
raise KeyError(index)
-if _WIN32:
+else: # _WIN32
DLLHANDLE = rwin32.HMODULE
RTLD_GLOBAL = None
@@ -153,5 +153,5 @@
raise KeyError(index)
# XXX rffi.cast here...
return res
-
+
LoadLibrary = rwin32.LoadLibrary
diff --git a/rpython/rlib/rerased.py b/rpython/rlib/rerased.py
--- a/rpython/rlib/rerased.py
+++ b/rpython/rlib/rerased.py
@@ -18,13 +18,11 @@
from rpython.annotator import model as annmodel
from rpython.tool.pairtype import pairtype
from rpython.rtyper.extregistry import ExtRegistryEntry
-from rpython.rtyper.rclass import getinstancerepr
from rpython.rtyper.rmodel import Repr
+from rpython.rtyper.lltypesystem import lltype, llmemory
from rpython.rtyper.lltypesystem.lloperation import llop
-from rpython.rtyper.lltypesystem.rclass import OBJECTPTR
-from rpython.rtyper.lltypesystem import lltype, llmemory
-from rpython.rtyper.error import TyperError
from rpython.rlib.rarithmetic import is_valid_int
+from rpython.rlib.debug import ll_assert
def erase_int(x):
@@ -161,8 +159,6 @@
return hop.args_r[0].rtype_unerase_int(hop, v)
def ll_unerase_int(gcref):
- from rpython.rtyper.lltypesystem.lloperation import llop
- from rpython.rlib.debug import ll_assert
x = llop.cast_ptr_to_int(lltype.Signed, gcref)
ll_assert((x&1) != 0, "unerased_int(): not an integer")
return x >> 1
diff --git a/rpython/rlib/rgc.py b/rpython/rlib/rgc.py
--- a/rpython/rlib/rgc.py
+++ b/rpython/rlib/rgc.py
@@ -5,7 +5,6 @@
from rpython.rlib import jit
from rpython.rlib.objectmodel import we_are_translated, enforceargs, specialize
-from rpython.rlib.nonconst import NonConstant
from rpython.rtyper.extregistry import ExtRegistryEntry
from rpython.rtyper.lltypesystem import lltype, llmemory
@@ -100,7 +99,6 @@
return annmodel.SomePtr(lltype.Ptr(ARRAY_TYPEID_MAP))
def specialize_call(self, hop):
- from rpython.memory.gc.base import ARRAY_TYPEID_MAP
hop.exception_is_here()
return hop.genop('gc_heap_stats', [], resulttype=hop.r_result)
diff --git a/rpython/rlib/rmd5.py b/rpython/rlib/rmd5.py
--- a/rpython/rlib/rmd5.py
+++ b/rpython/rlib/rmd5.py
@@ -25,7 +25,7 @@
Converted to RPython by arigo.
"""
-from rpython.rlib.rarithmetic import r_uint, r_ulonglong, intmask
+from rpython.rlib.rarithmetic import r_uint, r_ulonglong
if r_uint.BITS == 32:
diff --git a/rpython/rlib/rope.py b/rpython/rlib/rope.py
--- a/rpython/rlib/rope.py
+++ b/rpython/rlib/rope.py
@@ -1,9 +1,9 @@
import py
import sys
+import math
+
from rpython.rlib.rarithmetic import intmask, ovfcheck
from rpython.rlib.rarithmetic import r_uint, LONG_BIT
-from rpython.rlib.objectmodel import we_are_translated
-import math
LOG2 = math.log(2)
NBITS = int(math.log(sys.maxint) / LOG2) + 2
@@ -696,7 +696,6 @@
if i != start:
nodelist.append(LiteralUnicodeNode(uni[start:i]))
start = i
- strchunk = []
while i < length:
c = ord(uni[i])
if c >= 256:
@@ -973,28 +972,24 @@
def nextchar(self):
node = self.getnode()
- index = self.index
result = node.getchar(self.index)
self.advance_index()
return result
def nextunichar(self):
node = self.getnode()
- index = self.index
result = node.getunichar(self.index)
self.advance_index()
return result
def nextrope(self):
node = self.getnode()
- index = self.index
result = node.getrope(self.index)
self.advance_index()
return result
def nextint(self):
node = self.getnode()
- index = self.index
result = node.getint(self.index)
self.advance_index()
return result
@@ -1064,7 +1059,6 @@
assert 0 <= items < node.length()
while isinstance(node, BinaryConcatNode):
self.stack.append(node)
- right = node.right
left = node.left
if items >= left.length():
items -= left.length()
@@ -1085,7 +1079,7 @@
if self.index == -1:
self.seekback(0)
return self.node
-
+
nextchar = make_seekable_method("getchar")
nextunichar = make_seekable_method("getunichar")
nextint = make_seekable_method("getint")
diff --git a/rpython/rlib/rpoll.py b/rpython/rlib/rpoll.py
--- a/rpython/rlib/rpoll.py
+++ b/rpython/rlib/rpoll.py
@@ -5,11 +5,9 @@
function that directly takes a dictionary as argument.
"""
-import os
from rpython.rlib import _rsocket_rffi as _c
+from rpython.rlib.rarithmetic import r_uint
from rpython.rtyper.lltypesystem import lltype, rffi
-from rpython.rlib.rarithmetic import intmask, r_uint
-import math
# ____________________________________________________________
# events
diff --git a/rpython/rlib/rsha.py b/rpython/rlib/rsha.py
--- a/rpython/rlib/rsha.py
+++ b/rpython/rlib/rsha.py
@@ -13,7 +13,7 @@
converted to RPython by arigo.
"""
-from rpython.rlib.rarithmetic import r_uint, r_ulonglong, intmask
+from rpython.rlib.rarithmetic import r_uint, r_ulonglong
from rpython.rlib.unroll import unrolling_iterable
# We reuse helpers from rmd5 too
diff --git a/rpython/rlib/rstack.py b/rpython/rlib/rstack.py
--- a/rpython/rlib/rstack.py
+++ b/rpython/rlib/rstack.py
@@ -3,17 +3,13 @@
RPython-compliant way, intended mostly for use by the Stackless PyPy.
"""
-import inspect
-
import py
from rpython.rlib.objectmodel import we_are_translated
from rpython.rlib.rarithmetic import r_uint
from rpython.rlib import rgc
-from rpython.rtyper.extregistry import ExtRegistryEntry
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rtyper.lltypesystem.lloperation import llop
-from rpython.rtyper.controllerentry import Controller, SomeControlledInstance
from rpython.conftest import cdir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
diff --git a/rpython/rlib/rtimer.py b/rpython/rlib/rtimer.py
--- a/rpython/rlib/rtimer.py
+++ b/rpython/rlib/rtimer.py
@@ -1,6 +1,6 @@
import time
-from rpython.rlib.rarithmetic import r_longlong, r_ulonglong, r_uint
+from rpython.rlib.rarithmetic import r_longlong, r_uint
from rpython.rlib.rarithmetic import intmask, longlongmask
from rpython.rtyper.extregistry import ExtRegistryEntry
from rpython.rtyper.lltypesystem import lltype, rffi
diff --git a/rpython/rlib/runicode.py b/rpython/rlib/runicode.py
--- a/rpython/rlib/runicode.py
+++ b/rpython/rlib/runicode.py
@@ -876,7 +876,6 @@
else: # begin base64-encoded section
inShift = 1
shiftOutStartPos = pos - 1
- bitsleft = 0
elif _utf7_DECODE_DIRECT(oc): # character decodes at itself
result.append(unichr(oc))
@@ -894,7 +893,6 @@
if (surrogate or
base64bits >= 6 or
(base64bits > 0 and base64buffer != 0)):
- endinpos = size
msg = "unterminated shift sequence"
res, pos = errorhandler(errors, 'utf-7', msg, s, shiftOutStartPos, pos)
result.append(res)
@@ -1118,7 +1116,6 @@
def hexescape(builder, s, pos, digits,
encoding, errorhandler, message, errors):
- import sys
chr = 0
if pos + digits > len(s):
message = "end of string in escape sequence"
diff --git a/rpython/rlib/rweakref.py b/rpython/rlib/rweakref.py
--- a/rpython/rlib/rweakref.py
+++ b/rpython/rlib/rweakref.py
@@ -68,7 +68,6 @@
from rpython.rtyper import extregistry
from rpython.annotator import model as annmodel
-from rpython.annotator.bookkeeper import getbookkeeper
from rpython.tool.pairtype import pairtype
class Entry(extregistry.ExtRegistryEntry):
diff --git a/rpython/rlib/rwin32.py b/rpython/rlib/rwin32.py
--- a/rpython/rlib/rwin32.py
+++ b/rpython/rlib/rwin32.py
@@ -2,6 +2,9 @@
Common types, functions from core win32 libraries, such as kernel32
"""
+import os
+import errno
+
from rpython.rtyper.tool import rffi_platform
from rpython.tool.udir import udir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
@@ -9,7 +12,6 @@
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rlib.rarithmetic import intmask
from rpython.rlib import jit
-import os, sys, errno
# This module can be imported on any platform,
# but most symbols are not usable...
More information about the pypy-commit
mailing list