Extra py2 specific branches removed and replaced

Author: penguinolog

kubernetes/base/leaderelection/leaderelection.py

@@ -25,7 +25,7 @@
 
 """
 This package implements leader election using an annotation in a Kubernetes object.
-The onstarted_leading function is run in a thread and when it returns, if it does 
+The onstarted_leading function is run in a thread and when it returns, if it does
 it might not be safe to run it again in a process.
 
 At first all candidates are considered followers. The one to create a lock or update
@@ -115,17 +115,13 @@ def try_acquire_or_renew(self):
 
         # A lock is not created with that name, try to create one
         if not lock_status:
-            # To be removed when support for python2 will be removed
-            if sys.version_info > (3, 0):
-                if json.loads(old_election_record.body)['code'] != HTTPStatus.NOT_FOUND:
-                    logger.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name,
-                                                                                  old_election_record.reason))
-                    return False
-            else:
-                if json.loads(old_election_record.body)['code'] != HTTPStatus.NOT_FOUND:
-                    logger.info("Error retrieving resource lock {} as {}".format(self.election_config.lock.name,
-                                                                                  old_election_record.reason))
-                    return False
+            if json.loads(old_election_record.body)[
+                    'code'] != HTTPStatus.NOT_FOUND:
+                logger.info(
+                    "Error retrieving resource lock {} as {}".format(
+                        self.election_config.lock.name,
+                        old_election_record.reason))
+                return False
 
             logger.info("{} is trying to create a lock".format(leader_election_record.holder_identity))
             create_status = self.election_config.lock.create(name=self.election_config.lock.name,

kubernetes/base/watch/watch.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import http
 import json
 import pydoc
-import sys
 
 from kubernetes import client
 
@@ -28,14 +28,7 @@
 # provide return_type to Watch class's __init__.
 TYPE_LIST_SUFFIX = "List"
 
-
-PY2 = sys.version_info[0] == 2
-if PY2:
-    import httplib
-    HTTP_STATUS_GONE = httplib.GONE
-else:
-    import http
-    HTTP_STATUS_GONE = http.HTTPStatus.GONE
+HTTP_STATUS_GONE = http.HTTPStatus.GONE
 
 
 class SimpleNamespace: