Author: Antonio Cuni <[email protected]>
Branch: fastjson
Changeset: r65259:eaf022dca962
Date: 2013-07-08 10:31 +0200
http://bitbucket.org/pypy/pypy/changeset/eaf022dca962/
Log: rename _fastjson to _pypyjson
diff --git a/lib-python/2.7/json/__init__.py b/lib-python/2.7/json/__init__.py
--- a/lib-python/2.7/json/__init__.py
+++ b/lib-python/2.7/json/__init__.py
@@ -107,9 +107,9 @@
try:
# PyPy speedup, the interface is different than CPython's _json
- import _fastjson
+ import _pypyjson
except ImportError:
- _fastjson = None
+ _pypyjson = None
from .decoder import JSONDecoder
from .encoder import JSONEncoder
@@ -328,8 +328,8 @@
if (cls is None and encoding is None and object_hook is None and
parse_int is None and parse_float is None and
parse_constant is None and object_pairs_hook is None and not kw):
- if _fastjson and not isinstance(s, unicode):
- return _fastjson.loads(s)
+ if _pypyjson and not isinstance(s, unicode):
+ return _pypyjson.loads(s)
else:
return _default_decoder.decode(s)
if cls is None:
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -35,7 +35,7 @@
"thread", "itertools", "pyexpat", "_ssl", "cpyext", "array",
"binascii", "_multiprocessing", '_warnings',
"_collections", "_multibytecodec", "micronumpy", "_ffi",
- "_continuation", "_cffi_backend", "_csv", "cppyy", "_fastjson"]
+ "_continuation", "_cffi_backend", "_csv", "cppyy", "_pypyjson"]
))
translation_modules = default_modules.copy()
diff --git a/pypy/module/_fastjson/__init__.py
b/pypy/module/_pypyjson/__init__.py
rename from pypy/module/_fastjson/__init__.py
rename to pypy/module/_pypyjson/__init__.py
diff --git a/pypy/module/_fastjson/interp_decoder.py
b/pypy/module/_pypyjson/interp_decoder.py
rename from pypy/module/_fastjson/interp_decoder.py
rename to pypy/module/_pypyjson/interp_decoder.py
diff --git a/pypy/module/_fastjson/test/test__fastjson.py
b/pypy/module/_pypyjson/test/test__pypyjson.py
rename from pypy/module/_fastjson/test/test__fastjson.py
rename to pypy/module/_pypyjson/test/test__pypyjson.py
--- a/pypy/module/_fastjson/test/test__fastjson.py
+++ b/pypy/module/_pypyjson/test/test__pypyjson.py
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
import py
-from pypy.module._fastjson.interp_decoder import JSONDecoder
+from pypy.module._pypyjson.interp_decoder import JSONDecoder
def test_skip_whitespace():
s = ' hello '
@@ -14,95 +14,95 @@
class AppTest(object):
- spaceconfig = {"objspace.usemodules._fastjson": True}
+ spaceconfig = {"objspace.usemodules._pypyjson": True}
def test_raise_on_unicode(self):
- import _fastjson
- raises(TypeError, _fastjson.loads, u"42")
+ import _pypyjson
+ raises(TypeError, _pypyjson.loads, u"42")
def test_decode_constants(self):
- import _fastjson
- assert _fastjson.loads('null') is None
- raises(ValueError, _fastjson.loads, 'nul')
- raises(ValueError, _fastjson.loads, 'nu')
- raises(ValueError, _fastjson.loads, 'n')
- raises(ValueError, _fastjson.loads, 'nuXX')
+ import _pypyjson
+ assert _pypyjson.loads('null') is None
+ raises(ValueError, _pypyjson.loads, 'nul')
+ raises(ValueError, _pypyjson.loads, 'nu')
+ raises(ValueError, _pypyjson.loads, 'n')
+ raises(ValueError, _pypyjson.loads, 'nuXX')
#
- assert _fastjson.loads('true') is True
- raises(ValueError, _fastjson.loads, 'tru')
- raises(ValueError, _fastjson.loads, 'tr')
- raises(ValueError, _fastjson.loads, 't')
- raises(ValueError, _fastjson.loads, 'trXX')
+ assert _pypyjson.loads('true') is True
+ raises(ValueError, _pypyjson.loads, 'tru')
+ raises(ValueError, _pypyjson.loads, 'tr')
+ raises(ValueError, _pypyjson.loads, 't')
+ raises(ValueError, _pypyjson.loads, 'trXX')
#
- assert _fastjson.loads('false') is False
- raises(ValueError, _fastjson.loads, 'fals')
- raises(ValueError, _fastjson.loads, 'fal')
- raises(ValueError, _fastjson.loads, 'fa')
- raises(ValueError, _fastjson.loads, 'f')
- raises(ValueError, _fastjson.loads, 'falXX')
+ assert _pypyjson.loads('false') is False
+ raises(ValueError, _pypyjson.loads, 'fals')
+ raises(ValueError, _pypyjson.loads, 'fal')
+ raises(ValueError, _pypyjson.loads, 'fa')
+ raises(ValueError, _pypyjson.loads, 'f')
+ raises(ValueError, _pypyjson.loads, 'falXX')
def test_decode_string(self):
- import _fastjson
- res = _fastjson.loads('"hello"')
+ import _pypyjson
+ res = _pypyjson.loads('"hello"')
assert res == u'hello'
assert type(res) is unicode
def test_decode_string_utf8(self):
- import _fastjson
+ import _pypyjson
s = u'àèìòù'
- res = _fastjson.loads('"%s"' % s.encode('utf-8'))
+ res = _pypyjson.loads('"%s"' % s.encode('utf-8'))
assert res == s
def test_skip_whitespace(self):
- import _fastjson
+ import _pypyjson
s = ' "hello" '
- assert _fastjson.loads(s) == u'hello'
+ assert _pypyjson.loads(s) == u'hello'
s = ' "hello" extra'
- raises(ValueError, "_fastjson.loads(s)")
+ raises(ValueError, "_pypyjson.loads(s)")
def test_unterminated_string(self):
- import _fastjson
+ import _pypyjson
s = '"hello' # missing the trailing "
- raises(ValueError, "_fastjson.loads(s)")
+ raises(ValueError, "_pypyjson.loads(s)")
def test_escape_sequence(self):
- import _fastjson
- assert _fastjson.loads(r'"\\"') == u'\\'
- assert _fastjson.loads(r'"\""') == u'"'
- assert _fastjson.loads(r'"\/"') == u'/'
- assert _fastjson.loads(r'"\b"') == u'\b'
- assert _fastjson.loads(r'"\f"') == u'\f'
- assert _fastjson.loads(r'"\n"') == u'\n'
- assert _fastjson.loads(r'"\r"') == u'\r'
- assert _fastjson.loads(r'"\t"') == u'\t'
+ import _pypyjson
+ assert _pypyjson.loads(r'"\\"') == u'\\'
+ assert _pypyjson.loads(r'"\""') == u'"'
+ assert _pypyjson.loads(r'"\/"') == u'/'
+ assert _pypyjson.loads(r'"\b"') == u'\b'
+ assert _pypyjson.loads(r'"\f"') == u'\f'
+ assert _pypyjson.loads(r'"\n"') == u'\n'
+ assert _pypyjson.loads(r'"\r"') == u'\r'
+ assert _pypyjson.loads(r'"\t"') == u'\t'
def test_escape_sequence_in_the_middle(self):
- import _fastjson
+ import _pypyjson
s = r'"hello\nworld"'
- assert _fastjson.loads(s) == "hello\nworld"
+ assert _pypyjson.loads(s) == "hello\nworld"
def test_unterminated_string_after_escape_sequence(self):
- import _fastjson
+ import _pypyjson
s = r'"hello\nworld' # missing the trailing "
- raises(ValueError, "_fastjson.loads(s)")
+ raises(ValueError, "_pypyjson.loads(s)")
def test_escape_sequence_unicode(self):
- import _fastjson
+ import _pypyjson
s = r'"\u1234"'
- assert _fastjson.loads(s) == u'\u1234'
+ assert _pypyjson.loads(s) == u'\u1234'
def test_invalid_utf_8(self):
- import _fastjson
+ import _pypyjson
s = '"\xe0"' # this is an invalid UTF8 sequence inside a string
- raises(UnicodeDecodeError, "_fastjson.loads(s)")
+ raises(UnicodeDecodeError, "_pypyjson.loads(s)")
def test_decode_numeric(self):
import sys
- import _fastjson
+ import _pypyjson
def check(s, val):
- res = _fastjson.loads(s)
+ res = _pypyjson.loads(s)
assert type(res) is type(val)
assert res == val
#
@@ -136,14 +136,14 @@
def test_nan(self):
import math
- import _fastjson
- res = _fastjson.loads('NaN')
+ import _pypyjson
+ res = _pypyjson.loads('NaN')
assert math.isnan(res)
def test_decode_numeric_invalid(self):
- import _fastjson
+ import _pypyjson
def error(s):
- raises(ValueError, _fastjson.loads, s)
+ raises(ValueError, _pypyjson.loads, s)
#
error(' 42 abc')
error('.123')
@@ -155,34 +155,34 @@
error('0123') # numbers can't start with 0
def test_decode_object(self):
- import _fastjson
- assert _fastjson.loads('{}') == {}
- assert _fastjson.loads('{ }') == {}
+ import _pypyjson
+ assert _pypyjson.loads('{}') == {}
+ assert _pypyjson.loads('{ }') == {}
#
s = '{"hello": "world", "aaa": "bbb"}'
- assert _fastjson.loads(s) == {'hello': 'world',
+ assert _pypyjson.loads(s) == {'hello': 'world',
'aaa': 'bbb'}
- raises(ValueError, _fastjson.loads, '{"key"')
- raises(ValueError, _fastjson.loads, '{"key": 42')
+ raises(ValueError, _pypyjson.loads, '{"key"')
+ raises(ValueError, _pypyjson.loads, '{"key": 42')
def test_decode_object_nonstring_key(self):
- import _fastjson
- raises(ValueError, "_fastjson.loads('{42: 43}')")
+ import _pypyjson
+ raises(ValueError, "_pypyjson.loads('{42: 43}')")
def test_decode_array(self):
- import _fastjson
- assert _fastjson.loads('[]') == []
- assert _fastjson.loads('[ ]') == []
- assert _fastjson.loads('[1]') == [1]
- assert _fastjson.loads('[1, 2]') == [1, 2]
- raises(ValueError, "_fastjson.loads('[1: 2]')")
- raises(ValueError, "_fastjson.loads('[1, 2')")
- raises(ValueError, """_fastjson.loads('["extra comma",]')""")
+ import _pypyjson
+ assert _pypyjson.loads('[]') == []
+ assert _pypyjson.loads('[ ]') == []
+ assert _pypyjson.loads('[1]') == [1]
+ assert _pypyjson.loads('[1, 2]') == [1, 2]
+ raises(ValueError, "_pypyjson.loads('[1: 2]')")
+ raises(ValueError, "_pypyjson.loads('[1, 2')")
+ raises(ValueError, """_pypyjson.loads('["extra comma",]')""")
def test_unicode_surrogate_pair(self):
- import _fastjson
+ import _pypyjson
expected = u'z\U0001d120x'
- res = _fastjson.loads('"z\\ud834\\udd20x"')
+ res = _pypyjson.loads('"z\\ud834\\udd20x"')
assert res == expected
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
