Author: chrisz
Date: Sat Jan 29 13:53:10 2011
New Revision: 7222
URL: http://trac.turbogears.org/changeset/7222
Log:
Use the standard lib json package instead of simplejson if possible.
Modified:
projects/TurboJson/trunk/setup.py
projects/TurboJson/trunk/turbojson/jsonify.py
Modified: projects/TurboJson/trunk/setup.py
==============================================================================
--- projects/TurboJson/trunk/setup.py Sat Jan 29 13:41:14 2011 (r7221)
+++ projects/TurboJson/trunk/setup.py Sat Jan 29 13:53:10 2011 (r7222)
@@ -1,7 +1,17 @@
# -*- coding: UTF-8 -*-
+from sys import version_info as python_version
from setuptools import setup, find_packages
+
+if python_version < (2, 4):
+ raise SystemExit("TurboJson 1.3 requires Python 2.4 or later.")
+
+install_requires = ['PEAK-Rules >= 0.5a1.dev-r2600']
+if python_version < (2, 6):
+ install_requires.append('simplejson >= 1.9.1')
+
+
setup(
name = 'TurboJson',
version = '1.3.1',
@@ -17,13 +27,10 @@
'python.templating.engines',
'turbogears'
],
- install_requires = [
- 'PEAK-Rules >= 0.5a1.dev-r2600',
- 'simplejson >= 1.9.1'
- ],
+ install_requires = install_requires,
tests_require = [
- 'sqlalchemy',
- 'sqlobject'
+ 'SQLAlchemy',
+ 'SQLObject'
],
zip_safe = True,
packages = find_packages(),
Modified: projects/TurboJson/trunk/turbojson/jsonify.py
==============================================================================
--- projects/TurboJson/trunk/turbojson/jsonify.py Sat Jan 29 13:41:14
2011 (r7221)
+++ projects/TurboJson/trunk/turbojson/jsonify.py Sat Jan 29 13:53:10
2011 (r7222)
@@ -5,7 +5,10 @@
from peak.rules import abstract, around, when
-from simplejson import JSONEncoder
+try:
+ from json import JSONEncoder
+except ImportError: # Python < 2.6
+ from simplejson import JSONEncoder
__all__ = ['jsonify', 'encode', 'encode_iter']
