[tor-commits] [stem/master] Dropping hardcoded python 2.x check

[atagar at torproject.org]

commit 54eac73e62739cb40bced307ff6967548eb3af42
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Jan 21 00:42:46 2013 -0800

    Dropping hardcoded python 2.x check
    
    Our prereq module asserted that stem isn't compatable beyond the 2.x series.
    Clearly I'm trying to 'fix' that with this branch.
    
    Ideally we'd keep this check for our python 2.x codebase, and strip it when
    we do a 2to3 conversion. However, that's more error prone than I'd like so
    simply dropping the check entirely.
---
 stem/prereq.py |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/stem/prereq.py b/stem/prereq.py
index 6d4b054..f80a907 100644
--- a/stem/prereq.py
+++ b/stem/prereq.py
@@ -37,9 +37,7 @@ def check_requirements():
 
   major_version, minor_version = sys.version_info[0:2]
 
-  if major_version > 2:
-    raise ImportError("stem isn't compatible beyond the python 2.x series")
-  elif major_version < 2 or minor_version < 5:
+  if major_version < 2 or (major_version == 2 and minor_version < 5):
     raise ImportError("stem requires python version 2.5 or greater")