commit 921b8e40d7d039f0c873e37ad95eb90185fae656
author Joe Gregorio <jcgregorio@google.com> Fri Jun 15 15:51:51 2012 -0400
committer Joe Gregorio <jcgregorio@google.com> Fri Jun 15 15:51:51 2012 -0400
tree 24590990df27dd53bdc0d83c0d43b8db800c2485
parent 638663ca4501f7931d97c5033394ca54a3f83d6a

Clean up setup.py script

setup_oauth2client.py

diff --git a/setup_oauth2client.py b/setup_oauth2client.py
index 579fe5f..fd2b67d 100644
--- a/setup_oauth2client.py
+++ b/setup_oauth2client.py
@@ -28,11 +28,16 @@
     'python-gflags',
     ]
 
+needs_json = True
 try:
   import json
   needs_json = False
 except ImportError:
-  needs_json = True
+  try:
+    import simplejson
+    needs_json = False
+  except ImportError:
+    needs_json = True
 
 if needs_json:
   install_requires.append('simplejson')