Simplify python3 version checking

crobinso · crobinso · commit b95a6b6a3344 · 2017-05-05T13:56:31.000-04:00
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -23,7 +23,7 @@ import socket
 import sys
 import tempfile
 
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
+if sys.version_info[0] >= 3:
     # pylint: disable=F0401,W0622,E0611
     from xmlrpc.client import Fault, ProtocolError
     from urllib.parse import urlparse
@@ -61,7 +61,7 @@ def to_encoding(ustring):
     elif ustring is not None:
         string = str(ustring)
 
-    if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
+    if sys.version_info[0] >= 3:
         return string
 
     preferred = locale.getpreferredencoding()
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -18,7 +18,7 @@
 from io import BytesIO
 
 # pylint: disable=ungrouped-imports
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
+if sys.version_info[0] >= 3:
     # pylint: disable=F0401,E0611
     from configparser import SafeConfigParser
     from http.cookiejar import LoadError, MozillaCookieJar
diff --git a/bugzilla/bug.py b/bugzilla/bug.py
@@ -51,7 +51,7 @@ def __str__(self):
         'print(bug)' is not recommended because of potential encoding issues.
         Please use unicode(bug) where possible.
         '''
-        if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
+        if sys.version_info[0] >= 3:
             return self.__unicode__()
         else:
             return self.__unicode__().encode(
diff --git a/bugzilla/transport.py b/bugzilla/transport.py
@@ -7,7 +7,7 @@
 from logging import getLogger
 import sys
 
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
+if sys.version_info[0] >= 3:
     # pylint: disable=import-error,no-name-in-module
     from configparser import SafeConfigParser
     from urllib.parse import urlparse
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -8,7 +8,7 @@
 import shlex
 import sys
 
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
+if sys.version_info[0] >= 3:
     from io import StringIO
 else:
     from StringIO import StringIO
diff --git a/tests/bug.py b/tests/bug.py
@@ -63,7 +63,7 @@ def _assert_bug():
         dir(bug)
 
         # Test special pickle support
-        if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
+        if sys.version_info[0] >= 3:
             from io import BytesIO
             fd = BytesIO()
         else:
diff --git a/tests/rw_functional.py b/tests/rw_functional.py
@@ -17,7 +17,7 @@
 import sys
 import unittest
 
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
+if sys.version_info[0] >= 3:
     # pylint: disable=F0401,E0611
     from urllib.parse import urlparse
 else:
