From: Mike Verdone <redacted>
Date: Sun, 27 Mar 2011 11:59:18 +0000 (+0200)
Subject: Cleanup. Remove some Py 2.5 support. No more Py 2.5 support. Sorry.
X-Git-Tag: twitter-1.6~7
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/4b12a3a0d81d07d954935313642af53209dc3d40

Cleanup. Remove some Py 2.5 support. No more Py 2.5 support. Sorry.
---

diff --git a/twitter/api.py b/twitter/api.py
index 069afcd..52c800e 100644
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -8,13 +8,9 @@ except ImportError:
 from twitter.twitter_globals import POST_ACTIONS
 from twitter.auth import NoAuth
 
-def _py26OrGreater():
-    import sys
-    return sys.hexversion > 0x20600f0
-
-if _py26OrGreater():
+try:
     import json
-else:
+except ImportError:
     import simplejson as json
 
 class TwitterError(Exception):
@@ -30,10 +26,10 @@ class TwitterHTTPError(TwitterError):
     HTTP error interacting with twitter.com.
     """
     def __init__(self, e, uri, format, uriparts):
-      self.e = e
-      self.uri = uri
-      self.format = format
-      self.uriparts = uriparts
+        self.e = e
+        self.uri = uri
+        self.format = format
+        self.uriparts = uriparts
 
     def __str__(self):
         return (