python-bugzilla
diff --git a/‎bin/bugzilla‎
Lines changed: 5 additions & 3 deletions b/‎bin/bugzilla‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎bugzilla/__init__.py‎
Lines changed: 1 addition & 1 deletion b/‎bugzilla/__init__.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bugzilla/base.py‎
Lines changed: 4 additions & 2 deletions b/‎bugzilla/base.py‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎tests/__init__.py‎
Lines changed: 1 addition & 1 deletion b/‎tests/__init__.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/query.py‎
Lines changed: 1 addition & 1 deletion b/‎tests/query.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/rw_functional.py‎
Lines changed: 1 addition & 1 deletion b/‎tests/rw_functional.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tox.ini‎
Lines changed: 1 addition & 1 deletion b/‎tox.ini‎
Lines changed: 1 addition & 1 deletion
@@ -23,7 +23,7 @@ import socket
 import sys
 import tempfile
 
-if sys.version_info.major >= 3:
+if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
     # pylint: disable=F0401,W0622
     from xmlrpc.client import Fault, ProtocolError
     basestring = (str, bytes)
@@ -59,7 +59,7 @@ def to_encoding(ustring):
     elif ustring is not None:
         string = str(ustring)
 
-    if sys.version_info.major >= 3:
+    if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
         return string
     else:
         return string.encode(locale.getpreferredencoding(), 'replace')
@@ -968,7 +968,9 @@ def _do_modify(bz, parser, opt, args):
         "devel": (add_devwb, rm_devwb),
     }
 
-    wbmap = {k: v for k, v in wbmap.items() if wbmap[k][0] or wbmap[k][1]}
+    for k, v in wbmap.copy().items():
+        if not v[0] and not v[1]:
+            del(wbmap[k])
 
     log.debug("update bug dict=%s", update)
     log.debug("update flags dict=%s", flags)
 
@@ -15,7 +15,7 @@
 import sys
 from logging import getLogger
 
-if sys.version_info.major >= 3:
+if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
     # pylint: disable=F0401
     from xmlrpc.client import Fault, ServerProxy
 else:
 
@@ -15,7 +15,7 @@
 
 from io import BytesIO
 
-if sys.version_info.major >= 3:
+if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
     # pylint: disable=F0401,E0611
     from configparser import SafeConfigParser
     from http.cookiejar import LoadError, LWPCookieJar, MozillaCookieJar
@@ -969,7 +969,9 @@ def build_query(self,
         }
 
         # Strip out None elements in the dict
-        query = {k: v for k, v in query.items() if v is not None}
+        for k, v in query.copy().items():
+            if v is None:
+                del(query[k])
         return query
 
     def _query(self, query):
 
@@ -8,7 +8,7 @@
 import shlex
 import sys
 
-if sys.version_info.major >= 3:
+if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
     from io import StringIO
 else:
     from StringIO import StringIO
 
@@ -243,7 +243,7 @@ class RHBZTest(BZ4Test):
         'sub_components': ["Command-line tools (RHEL5)"]}
 
 
-class TestURLToQuery(unittest.TestCase):
+class TestURLToQuery(BZ34Test):
     def _check(self, url, query):
         self.assertDictEqual(bz4.url_to_query(url), query)
 
 
@@ -17,7 +17,7 @@
 import sys
 import unittest
 
-if sys.version_info.major >= 3:
+if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
     # pylint: disable=F0401,E0611
     from urllib.parse import urlparse
 else:
 
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33
+envlist = py26,py27,py33
 
 [testenv]
 deps=