Py3k add support for running the same codebase on python2.6/2.7 and 3.3+

Makefile

@@ -3,7 +3,8 @@ PROJECT=diamond
 VERSION :=$(shell bash version.sh )
 RELEASE :=$(shell ls -1 dist/*.noarch.rpm 2>/dev/null | wc -l )
 HASH	:=$(shell git rev-parse HEAD )
-DISTRO=precise
+DISTRO:=$(shell python -c "import platform;print(platform.linux_distribution()[0])")
+PYTHON?=python3
 
 all:
 	@echo "make run - Run Diamond from this directory"
@@ -39,19 +40,19 @@ docs: version
 	./build_doc.py --configfile=conf/diamond.conf
 
 sdist: version
-./setup.py sdist --prune
+$(PYTHON) setup.py sdist
 
 bdist: version
-./setup.py bdist --prune
+$(PYTHON) setup.py bdist
 
 bdist_wheel: version
-USE_SETUPTOOLS=1 ./setup.py bdist_wheel
+$(PYTHON) setup.py bdist_wheel
 
 install: version
-./setup.py install --root $(DESTDIR)
+$(PYTHON) setup.py install --root $(DESTDIR)
 
 develop: version
-USE_SETUPTOOLS=1 ./setup.py develop
+$(PYTHON) setup.py develop
 
 rpm: buildrpm
 
@@ -61,23 +62,29 @@ buildrpm: sdist
  --build-requires='python, python-configobj' \
  --requires='python, python-configobj'
 
+buildrpmpy3: sdist
+	$(PYTHON) setup.py bdist_rpm \
+ --release=`ls dist/*.noarch.rpm | wc -l` \
+ --build-requires='python3, python3-configobj' \
+ --requires='python3, python3-configobj'
+
 deb: builddeb
 
 sdeb: buildsourcedeb
 
-builddeb: version
+builddeb: version
 	dch --newversion $(VERSION) --distribution unstable --force-distribution -b "Last Commit: $(shell git log -1 --pretty=format:'(%ai) %H %cn <%ce>')"
 	dch --release "new upstream"
-	./setup.py sdist --prune
+	./setup.py sdist
 	mkdir -p build
 	tar -C build -zxf dist/$(PROJECT)-$(VERSION).tar.gz
 	(cd build/$(PROJECT)-$(VERSION) && debuild -us -uc -v$(VERSION))
 	@echo "Package is at build/$(PROJECT)_$(VERSION)_all.deb"
 
-buildsourcedeb: version
+buildsourcedeb: version
 	dch --newversion $(VERSION)~$(DISTRO) --distribution $(DISTRO) --force-distribution -b "Last Commit: $(shell git log -1 --pretty=format:'(%ai) %H %cn <%ce>')"
 	dch --release "new upstream"
-	./setup.py sdist --prune
+	./setup.py sdist
 	mkdir -p build
 	tar -C build -zxf dist/$(PROJECT)-$(VERSION).tar.gz
 	(cd build/$(PROJECT)-$(VERSION) && debuild -S -sa -v$(VERSION))
@@ -95,11 +102,12 @@ clean:
 	./setup.py clean
 	rm -rf dist build MANIFEST .tox *.log
 	find . -name '*.pyc' -delete
+	find -name __pycache__ -delete
 
 version:
 	./version.sh > version.txt
 
-vertest: version
+vertest: version
 	echo "${VERSION}"
 
 reltest:

bin/diamond

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # coding=utf-8
+from __future__ import print_function
 
 import os
 import sys
@@ -109,27 +110,27 @@ def main():
  gid = -1
 
  if options.version:
- print"Diamond version %s" % (get_diamond_version())
+ print("Diamond version %s" % (get_diamond_version()))
  sys.exit(0)
 
  # Initialize Config
  options.configfile = os.path.abspath(options.configfile)
  if os.path.exists(options.configfile):
  config = configobj.ConfigObj(options.configfile)
  else:
- print >> sys.stderr, "ERROR: Config file: %s does not exist." % (
- options.configfile)
+ print("ERROR: Config file: %s does not exist." % (
+ options.configfile), file=sys.stderr)
  parser.print_help(sys.stderr)
  sys.exit(1)
 
  # Initialize Logging
  log = setup_logging(options.configfile, options.log_stdout)
 
  # Pass the exit up stream rather then handle it as an general exception
- except SystemExit, e:
+ except SystemExit as e:
  raise SystemExit
 
- except Exception, e:
+ except Exception as e:
  import traceback
  sys.stderr.write("Unhandled exception: %s" % str(e))
  sys.stderr.write("traceback: %s" % traceback.format_exc())
@@ -145,7 +146,7 @@ def main():
 
  # Read existing pid file
  try:
- pf = file(options.pidfile, 'r')
+ pf = open(options.pidfile, 'r')
  pid = int(pf.read().strip())
  pf.close()
  except (IOError, ValueError):
@@ -158,11 +159,11 @@ def main():
  # Pid is not real
  os.unlink(options.pidfile)
  pid = None
- print >> sys.stderr, (
-"WARN: Bogus pid file was found. I deleted it.")
+ print("WARN: Bogus pid file was found. I deleted it.",
+file=sys.stderr)
  else:
- print >> sys.stderr, (
-"ERROR: Pidfile exists. Server already running?")
+ print("ERROR: Pidfile exists. Server already running?",
+ file=sys.stderr)
  sys.exit(1)
 
  # Get final GIDs
@@ -184,9 +185,10 @@ def main():
  # Write pid file
  pid = str(os.getpid())
  try:
- pf = file(options.pidfile, 'w+')
- except IOError, e:
- print >> sys.stderr, "Failed to write PID file: %s" % (e)
+ pf = open(options.pidfile, 'w+')
+ except IOError as e:
+ print("Failed to write PID file: %s" % (e),
+ file=sys.stderr)
  sys.exit(1)
  pf.write("%s\n" % pid)
  pf.close()
@@ -206,8 +208,9 @@ def main():
  # Set UID
  os.setuid(uid)
 
- except Exception, e:
- print >> sys.stderr, "ERROR: Failed to set UID/GID. %s" % (e)
+ except Exception as e:
+ print("ERROR: Failed to set UID/GID. %s" % (e),
+ file=sys.stderr)
  sys.exit(1)
 
  # Log
@@ -231,8 +234,8 @@ def main():
  if pid > 0:
  # Exit first paren
  sys.exit(0)
- except OSError, e:
- print >> sys.stderr, "Failed to fork process." % (e)
+ except OSError as e:
+ print("Failed to fork process." % (e), file=sys.stderr)
  sys.exit(1)
  # Decouple from parent environmen
  os.setsid()
@@ -243,8 +246,8 @@ def main():
  if pid > 0:
  # Exit second paren
  sys.exit(0)
- except OSError, e:
- print >> sys.stderr, "Failed to fork process." % (e)
+ except OSError as e:
+ print("Failed to fork process." % (e), file=sys.stderr)
  sys.exit(1)
  # Close file descriptors so that we can detach
  sys.stdout.close()
@@ -263,8 +266,8 @@ def main():
  # Write pid file
  pid = str(os.getpid())
  try:
- pf = file(options.pidfile, 'w+')
- except IOError, e:
+ pf = open(options.pidfile, 'w+')
+ except IOError as e:
  log.error("Failed to write child PID file: %s" % (e))
  sys.exit(1)
  pf.write("%s\n" % pid)
@@ -291,10 +294,10 @@ def main():
  server.run()
 
  # Pass the exit up stream rather then handle it as an general exception
- except SystemExit, e:
+ except SystemExit as e:
  raise SystemExit
 
- except Exception, e:
+ except Exception as e:
  import traceback
  log.error("Unhandled exception: %s" % str(e))
  log.error("traceback: %s" % traceback.format_exc())

bin/diamond-setup

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 ################################################################################
+from __future__ import print_function
 
 import os
 import sys
@@ -63,10 +64,10 @@ def getCollectors(path):
  break
  except TypeError:
  continue
- # print"Imported module: %s %s" % (modname, cls.__name__)
+ # print("Imported module: %s %s" % (modname, cls.__name__))
  except Exception:
- print"Failed to import module: %s. %s" % (
- modname, traceback.format_exc())
+ print("Failed to import module: %s. %s" % (
+ modname, traceback.format_exc()))
  collectors[modname] = False
  continue
 
@@ -77,7 +78,7 @@ def getCollectors(path):
 
 
 def typeToString(key):
- if isinstance(obj.config[key], basestring):
+ if isinstance(obj.config[key], str):
  user_val = obj.config[key]
  elif isinstance(obj.config[key], bool):
  user_val = str(obj.config[key])
@@ -94,15 +95,15 @@ def typeToString(key):
 def stringToType(key, val):
  if type(obj.config[key]) is type(val):
  config_file[key] = val
- elif isinstance(obj.config[key], basestring):
+ elif isinstance(obj.config[key], str):
  if val.lower() == 'false':
  config_file[key] = False
  elif val.lower() == 'true':
  config_file[key] = True
  else:
  config_file[key] = val
  elif isinstance(obj.config[key], bool):
- if isinstance(val, basestring):
+ if isinstance(val, str):
  config_file[key] = str_to_bool(val)
  else:
  config_file[key] = bool(val)
@@ -116,7 +117,7 @@ def stringToType(key, val):
 
 
 def boolCheck(val):
- if isinstance(val, basestring):
+ if isinstance(val, str):
  return str_to_bool(val)
  elif isinstance(val, bool):
  return val
@@ -133,9 +134,9 @@ def configureKey(key):
  except NotImplementedError:
  return
 
- print"\n"
+ print("\n")
  if key in default_conf_help:
- printdefault_conf_help[key]
+ print(default_conf_help[key])
  val = raw_input(key + ' [' + user_val + ']: ')
 
  # Empty user input? Default to current value
@@ -177,18 +178,18 @@ if __name__ == "__main__":
  if os.path.exists(options.configfile):
  config = ConfigObj(os.path.abspath(options.configfile))
  else:
- print >> sys.stderr, "ERROR: Config file: %s does not exist." % (
- options.configfile)
- print >> sys.stderr, ("Please run python config.py -c"
- + " /path/to/diamond.conf")
+ print("ERROR: Config file: %s does not exist." % (
+ options.configfile), file=sys.stderr)
+ print("Please run python config.py -c /path/to/diamond.conf",
+file=sys.stderr)
  parser.print_help(sys.stderr)
  sys.exit(1)
 
  if not options.dump:
- print ''
- print'I will be over writing files in'
- printconfig['server']['collectors_config_path']
- print'Please type yes to continue'
+ print('')
+ print('I will be over writing files in')
+ print(config['server']['collectors_config_path'])
+ print('Please type yes to continue')
 
  val = raw_input('Are you sure? ')
  if val != 'yes':
@@ -225,7 +226,7 @@ if __name__ == "__main__":
  obj = cls(config=config, handlers={})
 
  if options.dump:
- printcollector + " " + str(obj.config)
+ print(collector + " " + str(obj.config))
  continue
 
  default_conf = obj.get_default_config()
@@ -241,8 +242,8 @@ if __name__ == "__main__":
  config_keys['instance_prefix'] = False
  config_keys['interval'] = False
 
- print"\n\t\tNow configuring " + collector
- printcollectors[collector].__doc__
+ print("\n\t\tNow configuring " + collector)
+ print(collectors[collector].__doc__)
 
  configureKey('enabled')
 
@@ -254,12 +255,12 @@ if __name__ == "__main__":
 
  config_file.write()
 
- except IOError, (errno, strerror):
- print"I/O error({0}): {1}".format(errno, strerror)
+ except IOError as err:
+ print("I/O error({0}): {1}".format(err.errno, err.strerror))
  except KeyboardInterrupt:
- print
+ print("")
  sys.exit()
  except:
  continue
  if not foundcollector:
- print"Collector not found."
+ print("Collector not found.")