Author: Manuel Jacob
Branch: refactor-str-types
Changeset: r64608:cdea8495ecff
Date: 2013-05-24 22:47 +0200
http://bitbucket.org/pypy/pypy/changeset/cdea8495ecff/
Log: Merge bytearraytype.py into bytearrayobject.py.
diff --git a/pypy/objspace/std/bytearrayobject.py
b/pypy/objspace/std/bytearrayobject.py
--- a/pypy/objspace/std/bytearrayobject.py
+++ b/pypy/objspace/std/bytearrayobject.py
@@ -1,11 +1,20 @@
"""The builtin bytearray implementation"""
+from pypy.interpreter.baseobjspace import ObjSpace, W_Root
from pypy.interpreter.buffer import RWBuffer
from pypy.interpreter.error import OperationError, operationerrfmt
+from pypy.interpreter.gateway import interp2app
from pypy.interpreter.signature import Signature
+from pypy.objspace.std.bytesobject import (
+ W_StringObject, str_decode,
+ str_count, str_index, str_rindex, str_find, str_rfind, str_replace,
+ str_startswith, str_endswith, str_islower, str_isupper, str_isalpha,
+ str_isalnum, str_isdigit, str_isspace, str_istitle,
+ str_upper, str_lower, str_title, str_swapcase, str_capitalize,
+ str_expandtabs, str_ljust, str_rjust, str_center, str_zfill,
+ str_join, str_split, str_rsplit, str_partition, str_rpartition,
+ str_splitlines, str_translate)
from pypy.objspace.std import bytesobject
-from pypy.objspace.std.bytearraytype import (
- getbytevalue, makebytearraydata_w, new_bytearray)
from pypy.objspace.std.intobject import W_IntObject
from pypy.objspace.std.inttype import wrapint
from pypy.objspace.std.model import W_Object, registerimplementation
@@ -13,15 +22,14 @@
from pypy.objspace.std.noneobject import W_NoneObject
from pypy.objspace.std.register_all import register_all
from pypy.objspace.std.sliceobject import W_SliceObject, normalize_simple_slice
-from pypy.objspace.std.bytesobject import W_StringObject
+from pypy.objspace.std.stdtypedef import StdTypeDef, SMM
from pypy.objspace.std.unicodeobject import W_UnicodeObject
from pypy.objspace.std.util import get_positive_index
+from rpython.rlib.objectmodel import newlist_hint, resizelist_hint
from rpython.rlib.rstring import StringBuilder
class W_BytearrayObject(W_Object):
- from pypy.objspace.std.bytearraytype import bytearray_typedef as typedef
-
def __init__(w_self, data):
w_self.data = data
@@ -29,6 +37,166 @@
""" representation for debugging purposes """
return "%s(%s)" % (w_self.__class__.__name__, ''.join(w_self.data))
+
+bytearray_append = SMM('append', 2)
+bytearray_extend = SMM('extend', 2)
+bytearray_insert = SMM('insert', 3,
+ doc="B.insert(index, int) -> None\n\n"
+ "Insert a single item into the bytearray before "
+ "the given index.")
+
+bytearray_pop = SMM('pop', 2, defaults=(-1,),
+ doc="B.pop([index]) -> int\n\nRemove and return a "
+ "single item from B. If no index\nargument is given, "
+ "will pop the last value.")
+
+bytearray_remove = SMM('remove', 2,
+ doc="B.remove(int) -> None\n\n"
+ "Remove the first occurance of a value in B.")
+
+bytearray_reverse = SMM('reverse', 1,
+ doc="B.reverse() -> None\n\n"
+ "Reverse the order of the values in B in place.")
+
+bytearray_strip = SMM('strip', 2, defaults=(None,),
+ doc="B.strip([bytes]) -> bytearray\n\nStrip leading "
+ "and trailing bytes contained in the argument.\nIf "
+ "the argument is omitted, strip ASCII whitespace.")
+
+bytearray_lstrip = SMM('lstrip', 2, defaults=(None,),
+ doc="B.lstrip([bytes]) -> bytearray\n\nStrip leading "
+ "bytes contained in the argument.\nIf the argument is "
+ "omitted, strip leading ASCII whitespace.")
+
+bytearray_rstrip = SMM('rstrip', 2, defaults=(None,),
+ doc="'B.rstrip([bytes]) -> bytearray\n\nStrip trailing "
+ "bytes contained in the argument.\nIf the argument is "
+ "omitted, strip trailing ASCII whitespace.")
+
+def getbytevalue(space, w_value):
+ if space.isinstance_w(w_value, space.w_str):
+ string = space.str_w(w_value)
+ if len(string) != 1:
+ raise OperationError(space.w_ValueError, space.wrap(
+ "string must be of size 1"))
+ return string[0]
+
+ value = space.getindex_w(w_value, None)
+ if not 0 <= value < 256:
+ # this includes the OverflowError in case the long is too large
+ raise OperationError(space.w_ValueError, space.wrap(
+ "byte must be in range(0, 256)"))
+ return chr(value)
+
+def new_bytearray(space, w_bytearraytype, data):
+ w_obj = space.allocate_instance(W_BytearrayObject, w_bytearraytype)
+ W_BytearrayObject.__init__(w_obj, data)
+ return w_obj
+
+
+def descr__new__(space, w_bytearraytype, __args__):
+ return new_bytearray(space,w_bytearraytype, [])
+
+
+def makebytearraydata_w(space, w_source):
+ # String-like argument
+ try:
+ string = space.bufferstr_new_w(w_source)
+ except OperationError, e:
+ if not e.match(space, space.w_TypeError):
+ raise
+ else:
+ return [c for c in string]
+
+ # sequence of bytes
+ w_iter = space.iter(w_source)
+ length_hint = space.length_hint(w_source, 0)
+ data = newlist_hint(length_hint)
+ extended = 0
+ while True:
+ try:
+ w_item = space.next(w_iter)
+ except OperationError, e:
+ if not e.match(space, space.w_StopIteration):
+ raise
+ break
+ value = getbytevalue(space, w_item)
+ data.append(value)
+ extended += 1
+ if extended < length_hint:
+ resizelist_hint(data, extended)
+ return data
+
+def descr_bytearray__reduce__(space, w_self):
+ from pypy.objspace.std.bytearrayobject import W_BytearrayObject
+ assert isinstance(w_self, W_BytearrayObject)
+ w_dict = w_self.getdict(space)
+ if w_dict is None:
+ w_dict = space.w_None
+ return space.newtuple([
+ space.type(w_self), space.newtuple([
+ space.wrap(''.join(w_self.data).decode('latin-1')),
+ space.wrap('latin-1')]),
+ w_dict])
+
+def _hex_digit_to_int(d):
+ val = ord(d)
+ if 47 < val < 58:
+ return val - 48
+ if 96 < val < 103:
+ return val - 87
+ return -1
+
+def descr_fromhex(space, w_type, w_hexstring):
+ "bytearray.fromhex(string) -> bytearray\n"
+ "\n"
+ "Create a bytearray object from a string of hexadecimal numbers.\n"
+ "Spaces between two numbers are accepted.\n"
+ "Example: bytearray.fromhex('B9 01EF') -> bytearray(b'\\xb9\\x01\\xef')."
+ hexstring = space.str_w(w_hexstring)
+ hexstring = hexstring.lower()
+ data = []
+ length = len(hexstring)
+ i = -2
+ while True:
+ i += 2
+ while i < length and hexstring[i] == ' ':
+ i += 1
+ if i >= length:
+ break
+ if i+1 == length:
+ raise OperationError(space.w_ValueError, space.wrap(
+ "non-hexadecimal number found in fromhex() arg at position %d"
% i))
+
+ top = _hex_digit_to_int(hexstring[i])
+ if top == -1:
+ raise OperationError(space.w_ValueError, space.wrap(
+ "non-hexadecimal number found in fromhex() arg at position %d"
% i))
+ bot = _hex_digit_to_int(hexstring[i+1])
+ if bot == -1:
+ raise OperationError(space.w_ValueError, space.wrap(
+ "non-hexadecimal number found in fromhex() arg at position %d"
% (i+1,)))
+ data.append(chr(top*16 + bot))
+
+ # in CPython bytearray.fromhex is a staticmethod, so
+ # we ignore w_type and always return a bytearray
+ return new_bytearray(space, space.w_bytearray, data)
+
+# ____________________________________________________________
+
+bytearray_typedef = W_BytearrayObject.typedef = StdTypeDef(
+ "bytearray",
+ __doc__ = '''bytearray() -> an empty bytearray
+bytearray(sequence) -> bytearray initialized from sequence\'s items
+
+If the argument is a bytearray, the return value is the same object.''',
+ __new__ = interp2app(descr__new__),
+ __hash__ = None,
+ __reduce__ = interp2app(descr_bytearray__reduce__),
+ fromhex = interp2app(descr_fromhex, as_classmethod=True)
+ )
+bytearray_typedef.registermethods(globals())
+
registerimplementation(W_BytearrayObject)
init_signature = Signature(['source', 'encoding', 'errors'], None, None)
@@ -552,7 +720,6 @@
# Mutability methods
def bytearray_append__Bytearray_ANY(space, w_bytearray, w_item):
- from pypy.objspace.std.bytearraytype import getbytevalue
w_bytearray.data.append(getbytevalue(space, w_item))
def bytearray_extend__Bytearray_Bytearray(space, w_bytearray, w_other):
@@ -570,7 +737,6 @@
return w_bytearray1
def setitem__Bytearray_ANY_ANY(space, w_bytearray, w_index, w_item):
- from pypy.objspace.std.bytearraytype import getbytevalue
idx = space.getindex_w(w_index, space.w_IndexError, "bytearray index")
try:
w_bytearray.data[idx] = getbytevalue(space, w_item)
@@ -715,5 +881,4 @@
b = BytearrayBuffer(self.data)
return space.wrap(b)
-from pypy.objspace.std import bytearraytype
-register_all(vars(), bytearraytype)
+register_all(vars(), globals())
diff --git a/pypy/objspace/std/bytearraytype.py
b/pypy/objspace/std/bytearraytype.py
deleted file mode 100644
--- a/pypy/objspace/std/bytearraytype.py
+++ /dev/null
@@ -1,176 +0,0 @@
-from pypy.interpreter.baseobjspace import ObjSpace, W_Root
-from pypy.interpreter.error import OperationError
-from pypy.interpreter.gateway import interp2app
-from pypy.objspace.std.register_all import register_all
-from pypy.objspace.std.stdtypedef import StdTypeDef, SMM
-
-from pypy.objspace.std.bytesobject import (
- str_decode,
- str_count, str_index, str_rindex, str_find, str_rfind, str_replace,
- str_startswith, str_endswith, str_islower, str_isupper, str_isalpha,
- str_isalnum, str_isdigit, str_isspace, str_istitle,
- str_upper, str_lower, str_title, str_swapcase, str_capitalize,
- str_expandtabs, str_ljust, str_rjust, str_center, str_zfill,
- str_join, str_split, str_rsplit, str_partition, str_rpartition,
- str_splitlines, str_translate)
-
-from rpython.rlib.objectmodel import newlist_hint, resizelist_hint
-
-bytearray_append = SMM('append', 2)
-bytearray_extend = SMM('extend', 2)
-bytearray_insert = SMM('insert', 3,
- doc="B.insert(index, int) -> None\n\n"
- "Insert a single item into the bytearray before "
- "the given index.")
-
-bytearray_pop = SMM('pop', 2, defaults=(-1,),
- doc="B.pop([index]) -> int\n\nRemove and return a "
- "single item from B. If no index\nargument is given, "
- "will pop the last value.")
-
-bytearray_remove = SMM('remove', 2,
- doc="B.remove(int) -> None\n\n"
- "Remove the first occurance of a value in B.")
-
-bytearray_reverse = SMM('reverse', 1,
- doc="B.reverse() -> None\n\n"
- "Reverse the order of the values in B in place.")
-
-bytearray_strip = SMM('strip', 2, defaults=(None,),
- doc="B.strip([bytes]) -> bytearray\n\nStrip leading "
- "and trailing bytes contained in the argument.\nIf "
- "the argument is omitted, strip ASCII whitespace.")
-
-bytearray_lstrip = SMM('lstrip', 2, defaults=(None,),
- doc="B.lstrip([bytes]) -> bytearray\n\nStrip leading "
- "bytes contained in the argument.\nIf the argument is "
- "omitted, strip leading ASCII whitespace.")
-
-bytearray_rstrip = SMM('rstrip', 2, defaults=(None,),
- doc="'B.rstrip([bytes]) -> bytearray\n\nStrip trailing "
- "bytes contained in the argument.\nIf the argument is "
- "omitted, strip trailing ASCII whitespace.")
-
-def getbytevalue(space, w_value):
- if space.isinstance_w(w_value, space.w_str):
- string = space.str_w(w_value)
- if len(string) != 1:
- raise OperationError(space.w_ValueError, space.wrap(
- "string must be of size 1"))
- return string[0]
-
- value = space.getindex_w(w_value, None)
- if not 0 <= value < 256:
- # this includes the OverflowError in case the long is too large
- raise OperationError(space.w_ValueError, space.wrap(
- "byte must be in range(0, 256)"))
- return chr(value)
-
-def new_bytearray(space, w_bytearraytype, data):
- from pypy.objspace.std.bytearrayobject import W_BytearrayObject
- w_obj = space.allocate_instance(W_BytearrayObject, w_bytearraytype)
- W_BytearrayObject.__init__(w_obj, data)
- return w_obj
-
-
-def descr__new__(space, w_bytearraytype, __args__):
- return new_bytearray(space,w_bytearraytype, [])
-
-
-def makebytearraydata_w(space, w_source):
- # String-like argument
- try:
- string = space.bufferstr_new_w(w_source)
- except OperationError, e:
- if not e.match(space, space.w_TypeError):
- raise
- else:
- return [c for c in string]
-
- # sequence of bytes
- w_iter = space.iter(w_source)
- length_hint = space.length_hint(w_source, 0)
- data = newlist_hint(length_hint)
- extended = 0
- while True:
- try:
- w_item = space.next(w_iter)
- except OperationError, e:
- if not e.match(space, space.w_StopIteration):
- raise
- break
- value = getbytevalue(space, w_item)
- data.append(value)
- extended += 1
- if extended < length_hint:
- resizelist_hint(data, extended)
- return data
-
-def descr_bytearray__reduce__(space, w_self):
- from pypy.objspace.std.bytearrayobject import W_BytearrayObject
- assert isinstance(w_self, W_BytearrayObject)
- w_dict = w_self.getdict(space)
- if w_dict is None:
- w_dict = space.w_None
- return space.newtuple([
- space.type(w_self), space.newtuple([
- space.wrap(''.join(w_self.data).decode('latin-1')),
- space.wrap('latin-1')]),
- w_dict])
-
-def _hex_digit_to_int(d):
- val = ord(d)
- if 47 < val < 58:
- return val - 48
- if 96 < val < 103:
- return val - 87
- return -1
-
-def descr_fromhex(space, w_type, w_hexstring):
- "bytearray.fromhex(string) -> bytearray\n"
- "\n"
- "Create a bytearray object from a string of hexadecimal numbers.\n"
- "Spaces between two numbers are accepted.\n"
- "Example: bytearray.fromhex('B9 01EF') -> bytearray(b'\\xb9\\x01\\xef')."
- hexstring = space.str_w(w_hexstring)
- hexstring = hexstring.lower()
- data = []
- length = len(hexstring)
- i = -2
- while True:
- i += 2
- while i < length and hexstring[i] == ' ':
- i += 1
- if i >= length:
- break
- if i+1 == length:
- raise OperationError(space.w_ValueError, space.wrap(
- "non-hexadecimal number found in fromhex() arg at position %d"
% i))
-
- top = _hex_digit_to_int(hexstring[i])
- if top == -1:
- raise OperationError(space.w_ValueError, space.wrap(
- "non-hexadecimal number found in fromhex() arg at position %d"
% i))
- bot = _hex_digit_to_int(hexstring[i+1])
- if bot == -1:
- raise OperationError(space.w_ValueError, space.wrap(
- "non-hexadecimal number found in fromhex() arg at position %d"
% (i+1,)))
- data.append(chr(top*16 + bot))
-
- # in CPython bytearray.fromhex is a staticmethod, so
- # we ignore w_type and always return a bytearray
- return new_bytearray(space, space.w_bytearray, data)
-
-# ____________________________________________________________
-
-bytearray_typedef = StdTypeDef("bytearray",
- __doc__ = '''bytearray() -> an empty bytearray
-bytearray(sequence) -> bytearray initialized from sequence\'s items
-
-If the argument is a bytearray, the return value is the same object.''',
- __new__ = interp2app(descr__new__),
- __hash__ = None,
- __reduce__ = interp2app(descr_bytearray__reduce__),
- fromhex = interp2app(descr_fromhex, as_classmethod=True)
- )
-bytearray_typedef.registermethods(globals())
diff --git a/pypy/objspace/std/model.py b/pypy/objspace/std/model.py
--- a/pypy/objspace/std/model.py
+++ b/pypy/objspace/std/model.py
@@ -38,7 +38,7 @@
from pypy.objspace.std.complextype import complex_typedef
from pypy.objspace.std.basestringtype import basestring_typedef
from pypy.objspace.std.bytesobject import str_typedef
- from pypy.objspace.std.bytearraytype import bytearray_typedef
+ from pypy.objspace.std.bytearrayobject import bytearray_typedef
from pypy.objspace.std.typeobject import type_typedef
from pypy.objspace.std.slicetype import slice_typedef
from pypy.objspace.std.longtype import long_typedef
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
