Revert "Switch to python3"

This reverts commit a9e9f6e.

Change-Id: Ia96b6060e4d06b8bc96899bab76f83f8b74e364f

Author: TristanCacqueray

tools/compare_distro_files.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2018 Red Hat
 #

tools/compare_pip_and_rpm_repo.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2018 Red Hat
 #

tools/get_package_lists.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2018 Red Hat
 #

wait_for_other_jobs.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2016 Red Hat, Inc

zuul_discover_tag_branch.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #
@@ -52,10 +52,9 @@ def main(self, args):
             else:
                 self.log.info("Choosing '%s'" % valid_branch[0])
                 print(valid_branch[0])
-        except Exception:
+        except:
             self.log.error("Couldn't find branch for tag %s" % tag)
             exit(1)
 
-
 if __name__ == "__main__":
     ZuulDiscoverTagBranch()

zuul_format_patch.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2019 Red Hat
 #
@@ -144,7 +144,7 @@ def solve_conflict(change):
             git("cherry-pick FETCH_HEAD")
         except RuntimeError:
             if not solve_conflict(change):
-                input("Fix cherry-pick and press enter to continue...: ")
+                raw_input("Fix cherry-pick and press enter to continue...: ")
         change["filename"] = git(
             "format-patch -1 %s" % patches["paths"], read=True).strip()
         print("<= patch is %s" % change["filename"])

zuul_koji_compare_tag.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #

zuul_koji_lib.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #

zuul_koji_mash.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #

zuul_koji_populate_target.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #

zuul_koji_set_target.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #

zuul_koji_sign_release.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #
@@ -65,7 +65,7 @@ def retrieve_pkgs_to_sign(self):
 
     def write_nvr_list_to_sign(self):
         self.to_sign_txt = os.path.join(self.td, 'to_sign.txt')
-        fd = open(self.to_sign_txt, 'w')
+        fd = file(self.to_sign_txt, 'w')
         for i in self.to_sign:
             pkg = re.sub('.el7.*$', '.el7', i)
             fd.write("%s\n" % pkg)
@@ -92,6 +92,5 @@ def main(self, args):
     koji write-signed-rpm 1c3bae4b $nvr;
 done""" % self.to_sign_txt)
 
-
 if __name__ == "__main__":
     ZuulKojiSignRelease()

zuul_rpm_build.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2016 Red Hat
 #
@@ -138,7 +138,7 @@ def build_srpm(self, distgit, source_version=None):
 
     def check_postinstall_failed(self, project):
         pattern = "^WARNING .* Failed install built packages$"
-        rootlog = open(os.path.join(self.args.local_output, 'root.log')).read()
+        rootlog = file(os.path.join(self.args.local_output, 'root.log')).read()
         if re.findall(pattern, rootlog, re.MULTILINE):
             raise RuntimeError("%s: built packages failed to be installed" %
                                project)
@@ -186,7 +186,7 @@ def create_mock_config(self):
         rendered = self.render_mock_template()
         if not os.path.isdir(os.path.dirname(mockconf)):
             os.mkdir(os.path.dirname(mockconf))
-        open(mockconf, 'w').write(rendered)
+        file(mockconf, 'w').write(rendered)
 
     def get_package_info(self, project, fallback=None):
         package_info = [pi for pi in self.distro_info['packages']

zuul_rpm_publish.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #
@@ -79,7 +79,7 @@ def main(self, args):
             srpms = glob.glob("zuul-rpm-build/*.src.rpm")
         else:
             srpms = self.get_srpms(args.testing_repo)
-            srpms = filter(lambda x: re.match(r"^%s-\d.*" % package_name, x),
+            srpms = filter(lambda x: re.match("^%s-\d.*" % package_name, x),
                            srpms)
 
         if len(srpms) != 1:
@@ -99,8 +99,8 @@ def main(self, args):
             # If the build task was unable to build the pkg for other reason
             # that a "Build already exists" error then the following task will
             # fail too.
-            print("Build failed but if it was because of NVR already built")
-            print("then try to add it to the tag.")
+            print "Build failed but if it was because of NVR already built"
+            print "then try to add it to the tag."
             self.execute(["koji", "--authtype=ssl", "tag-build",
                           self.distro_info["koji-target"],
                           srpm.replace('.src.rpm', '')])

zuul_rpm_setup.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #
@@ -32,7 +32,7 @@ def write_repo(self, of, conf):
             conf["repourl"] = "mirrorlist=%s" % conf["mirror"]
         elif "baseurl" in conf:
             conf["repourl"] = "baseurl=%s" % conf["baseurl"]
-        print(conf)
+        print conf
         of.write("""[%(name)s]
 name=%(name)s
 %(repourl)s
@@ -48,7 +48,7 @@ def check_repo(self, url):
             request.get_method = lambda: 'HEAD'
             response = urllib2.urlopen(request)
             return response.info().getheader('Content-Length') > 0
-        except Exception:
+        except:
             return False
 
     def main(self, args):

zuul_set_distro_branch.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2017 Red Hat
 #
@@ -34,7 +34,7 @@ def usage(self):
     def clone_config_repo(self, base_dir, git_server):
         dirname = "%s/%s" % (base_dir, 'config')
         if not os.path.isdir(os.path.dirname(dirname)):
-            os.mkdir(os.path.dirname(dirname), 0o700)
+            os.mkdir(os.path.dirname(dirname), 0700)
         repourl = "%s/config" % git_server
         if not os.path.isdir(dirname):
             self.log.info("Cloning %s to %s" % (repourl, dirname))
@@ -100,7 +100,7 @@ def update_repo_def(self, resources, raw_resources, name, branch, bfrom):
     def main(self, args):
         base_dir = os.path.expanduser(args.local_git_dir)
         if not os.path.isdir(base_dir):
-            os.mkdir(base_dir, 0o700)
+            os.mkdir(base_dir, 0700)
         # Get repos list to act on
         packages = self.distro_info["packages"]
         bfrom = self.distro_info.get("from", "master")
@@ -119,16 +119,16 @@ def main(self, args):
         self.clone_config_repo(base_dir, args.git_server)
         p_resources_path = os.path.join(
             base_dir, 'config', 'resources', args.project_resources)
-        raw_resources = open(p_resources_path).readlines()
-        resources = yaml.safe_load(open(p_resources_path))
+        raw_resources = file(p_resources_path).readlines()
+        resources = yaml.load(file(p_resources_path))
         for name in repos_names:
             self.update_repo_def(
                 resources,
                 raw_resources,
                 name,
                 branch,
                 bfrom)
-        open(p_resources_path, 'w').write("\n".join(raw_resources))
+        file(p_resources_path, 'w').writelines(raw_resources)
 
 
 if __name__ == "__main__":

zuul_update_spec.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 #
 # Copyright 2019 Red Hat
 #