From fdae686e12c07fa6af1b2904513faa747d252afd Mon Sep 17 00:00:00 2001 From: Jakub Roztocil Date: Tue, 24 Feb 2015 08:18:03 +0100 Subject: [PATCH] Clean up `compat` and fix `is_pypy`. --- httpie/compat.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/httpie/compat.py b/httpie/compat.py index d78d94f3..2e9e3291 100644 --- a/httpie/compat.py +++ b/httpie/compat.py @@ -5,13 +5,11 @@ Python 2.6, 2.7, and 3.x compatibility. import sys -# Taken from `requests.compat` -_ver = sys.version_info -is_py2 = (_ver[0] == 2) -is_py26 = (is_py2 and _ver[1] == 6) -is_py27 = (is_py2 and _ver[1] == 7) -is_py3 = (_ver[0] == 3) -is_pypy = ('pypy' in _ver) +is_py2 = sys.version_info[0] == 2 +is_py26 = sys.version_info[:2] == (2, 6) +is_py27 = sys.version_info[:2] == (2, 7) +is_py3 = sys.version_info[0] == 3 +is_pypy = 'pypy' in sys.version.lower() is_windows = 'win32' in str(sys.platform).lower()