Merge remote branch 'adamv/master'

crispywalrus · crispywalrus · commit 655c2453f4cd · 2010-07-08T10:19:35.000-07:00
diff --git a/github2/request.py b/github2/request.py
@@ -1,6 +1,9 @@
 import sys
 import httplib
-import simplejson
+try:
+    import json as simplejson # For Python 2.6
+except ImportError:
+    import simplejson
 from urlparse import urlparse, urlunparse
 try:
     from urlparse import parse_qs
