Merge pull request htcondor#61 from JaimeFrey/HTCONDOR-549-python2-co…

…mpat

Use Python 2 on EL7 HTCONDOR-549

rpm/blahp.spec

@@ -4,7 +4,9 @@
 %define bl_libexecdir %{_libexecdir}/%{name}
 
 # Force brp-python-bytecompile to use Python 3
+%if ! 0%{?rhel} == 7
 %global __python /usr/bin/python3
+%endif
 
 Name:		blahp
 Version:	2.1.0
@@ -31,7 +33,9 @@ BuildRequires:  globus-gsi-proxy-core-devel
 BuildRequires:  globus-gsi-cert-utils-devel
 BuildRequires:  docbook-style-xsl, libxslt
 
+%if ! 0%{?rhel} == 7
 Requires:       python3
+%endif
 
 %description
 %{summary}
@@ -40,6 +44,10 @@ Requires:       python3
 %setup
 
 %build
+%if 0%{?rhel} == 7
+# Don't rely on Python 3 on EL7 (not installed by default)
+sed -i 's;/usr/bin/python3;/usr/bin/python2;' src/scripts/*status.py
+%endif
 ./bootstrap
 export CPPFLAGS="-I/usr/include/classad -std=c++11 -fcommon"
 export LDFLAGS="-lclassad -lglobus_gsi_credential -lglobus_common -lglobus_gsi_proxy_core"

src/scripts/blah.py

@@ -1,7 +1,11 @@
 """Common functions for BLAH python scripts"""
 
-from configparser import RawConfigParser
-from io import StringIO
+try:  # for Python 2
+    from ConfigParser import RawConfigParser
+    from StringIO import StringIO
+except ImportError:  # for Python 3
+    from configparser import RawConfigParser
+    from io import StringIO
 
 class BlahConfigParser(RawConfigParser, object):
 

src/scripts/lsf_status.py

@@ -31,6 +31,8 @@
 for subsequent queries.
 """
 
+from __future__ import print_function
+
 import os
 import re
 import pwd

src/scripts/pbs_status.py

@@ -28,6 +28,8 @@
 for subsequent queries.
 """
 
+from __future__ import print_function
+
 import os
 import re
 import pwd

src/scripts/slurm_status.py

@@ -28,6 +28,8 @@
 will reuse this for subsequent queries.
 """
 
+from __future__ import print_function
+
 import os
 import re
 import pwd