From b8e86ebfcf58cbf998ac981326c65f6ffb500a00 Mon Sep 17 00:00:00 2001
From: Christian Hammond <chipx86@chipx86.com>
Date: Thu, 5 Nov 2009 03:16:47 -0800
Subject: Don't depend on simplejson on Python 2.6 eggs.

We were requiring the simplejson dependency on Python 2.6, despite the
fact that Python 2.6 includes json built-in. We no longer depend on simplejson
on this version.

Fixes bug #1383
---
 setup.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6084b3c..08f4fbe 100755
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,15 @@ else:
     download_url = "http://downloads.reviewboard.org/nightlies/"
 
 
+install_requires = []
+
+
+try:
+    import json
+except ImportError:
+    install_requires.append('simplejson')
+
+
 setup(name=PACKAGE_NAME,
       version=get_package_version(),
       license="MIT",
@@ -46,7 +55,7 @@ setup(name=PACKAGE_NAME,
               'post-review = rbtools.postreview:main',
           ],
       },
-      install_requires=['simplejson'],
+      install_requires=install_requires,
       dependency_links = [
           download_url,
       ],
-- 
cgit v1.2.3