r13821 - in MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk: . Products/MasterSelectWidget docs

Author: thomasdesvenain
Date: Mon Oct 10 10:58:40 2011
New Revision: 13821

Modified:
   MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/Products/MasterSelectWidget/browser.py
   MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/docs/HISTORY.txt
   MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/setup.py
Log:
Try to use embedded json (Python 2.6+).

Modified: MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/Products/MasterSelectWidget/browser.py
==============================================================================
--- MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/Products/MasterSelectWidget/browser.py	(original)
+++ MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/Products/MasterSelectWidget/browser.py	Mon Oct 10 10:58:40 2011
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
-import simplejson as json
+try:
+    import json
+except:
+    import simplejson as json
+
 from zope.i18n import translate
 from zope.component import getAdapters
 from Products.Archetypes import DisplayList

Modified: MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/docs/HISTORY.txt
==============================================================================
--- MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/docs/HISTORY.txt	(original)
+++ MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/docs/HISTORY.txt	Mon Oct 10 10:58:40 2011
@@ -4,6 +4,9 @@
 0.4.5 (unreleased)
 ------------------
 
+* Try to use embedded json (Python 2.6+).
+  [thomasdesvenain]
+
 * Avoid warnings at startup.
   [thomasdesvenain]
 

Modified: MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/setup.py
==============================================================================
--- MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/setup.py	(original)
+++ MoreFieldsAndWidgets/Products.MasterSelectWidget/trunk/setup.py	Mon Oct 10 10:58:40 2011
@@ -1,8 +1,14 @@
-from setuptools import setup, find_packages
 import os
+import sys
+from setuptools import setup, find_packages
 
 version = '0.4.4'
 
+if sys.version_info[0] == 2 and sys.version_info[1] < 6:
+    requires = ['simplejson']
+else:
+    requires = []
+
 setup(name='Products.MasterSelectWidget',
       version=version,
       description="An Archetypes widget that controls the vocabulary or "
@@ -26,8 +32,7 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
-          'simplejson',
-      ],
+      ] + requires,
       entry_points="""
       # -*- Entry points: -*-
       """,

------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1