diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index e215865114..b7348d4866 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Set up Python 2.7
       uses: actions/setup-python@v2
       with:
-        python-version: 2.7
+        python-version: 2.x
     - name: Set up Java 8
       uses: actions/setup-java@v1
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6cb1362c11..e51a5d9e0e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Set up Python 2.7
       uses: actions/setup-python@v2
       with:
-        python-version: 2.7
+        python-version: 2.x
     - name: Set up Java 8
       uses: actions/setup-java@v1
       with:
diff --git a/CI/ghApiClient.py b/CI/ghApiClient.py
index 9f9a3811cd..09209073df 100755
--- a/CI/ghApiClient.py
+++ b/CI/ghApiClient.py
@@ -18,13 +18,13 @@ def readUrl(name):
         content = urllib2.urlopen(request).read()
         jcont = json.loads(content)
         return jcont;
-    except urllib2.HTTPError, e:
+    except urllib2.HTTPError as e:
         print ('HTTPError = ' + str(e.code))
         raise e
-    except urllib2.URLError, e:
+    except urllib2.URLError as e:
         print ('URLError = ' + str(e.reason))
         raise e
-    except httplib.HTTPException, e:
+    except httplib.HTTPException as e:
         print ('HTTPException = ' + str(e))
         raise e
     except Exception:
@@ -42,14 +42,14 @@ def postUrl(name, body):
         content = urllib2.urlopen(request, body).read()
         jcont = json.loads(content)
         return jcont;
-    except urllib2.HTTPError, e:
+    except urllib2.HTTPError as e:
         print ('HTTPError = ' + str(e.code))
         print (str(e))
         raise e
-    except urllib2.URLError, e:
+    except urllib2.URLError as e:
         print ('URLError = ' + str(e.reason))
         raise e
-    except httplib.HTTPException, e:
+    except httplib.HTTPException as e:
         print ('HTTPException = ' + str(e))
         raise e
     except Exception: