diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-15 15:05:55 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-15 15:05:55 -0400 |
commit | 30fc9f2e1e8f5e59fa98d9e9df6263da88b9eaed (patch) | |
tree | 0c2c0d40e9e893d7a28f3dfcc7d5ebc3e81185a3 /tools | |
parent | de4940d9f39c51d68623eba9c99cc0a56deb9428 (diff) | |
download | bcfg2-30fc9f2e1e8f5e59fa98d9e9df6263da88b9eaed.tar.gz bcfg2-30fc9f2e1e8f5e59fa98d9e9df6263da88b9eaed.tar.bz2 bcfg2-30fc9f2e1e8f5e59fa98d9e9df6263da88b9eaed.zip |
removed print statements
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/accounts2xml.py | 4 | ||||
-rwxr-xr-x | tools/bcfg2-profile-templates.py | 4 | ||||
-rwxr-xr-x | tools/bcfg2_svnlog.py | 2 | ||||
-rwxr-xr-x | tools/export.py | 28 | ||||
-rwxr-xr-x | tools/selinux_baseline.py | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | tools/yum-listpkgs-xml.py | 1 |
6 files changed, 20 insertions, 21 deletions
diff --git a/tools/accounts2xml.py b/tools/accounts2xml.py index de41c6107..0f7624f7d 100755 --- a/tools/accounts2xml.py +++ b/tools/accounts2xml.py @@ -71,7 +71,7 @@ def main(args): with file(filename, 'w') as modified: modified.write("name:pass:uid:gid:gecos:home:shell\n" + data); modified.close() safe_filename = "Properties" except IndexError: - print "ERROR: Please provide a filename.csv as the first argument" + print("ERROR: Please provide a filename.csv as the first argument") sys.exit() node_user = "UnixUser" @@ -107,7 +107,7 @@ def main(args): output_file = "accounts.xml" doc.writexml(open(output_file, 'w'), addindent=' ', newl='\n') # Write file - print "Done: Created %s" % output_file + print("Done: Created %s" % output_file) os.remove(filename) def create_col_nodes(cols, item, doc, row): diff --git a/tools/bcfg2-profile-templates.py b/tools/bcfg2-profile-templates.py index 1cecc0274..d60d7584a 100755 --- a/tools/bcfg2-profile-templates.py +++ b/tools/bcfg2-profile-templates.py @@ -120,9 +120,9 @@ def main(): continue if avg > 0.01 or templates: tmpltimes.append((tmpl, avg)) - print "%-50s %s" % ("Template", "Average Render Time") + print("%-50s %s" % ("Template", "Average Render Time")) for tmpl, avg in reversed(sorted(tmpltimes, key=operator.itemgetter(1))): - print "%-50s %.02f" % (tmpl, avg) + print("%-50s %.02f" % (tmpl, avg)) # TODO: complain about templates that on average were quick but # for which some clients were slow diff --git a/tools/bcfg2_svnlog.py b/tools/bcfg2_svnlog.py index af0624788..5a03bf993 100755 --- a/tools/bcfg2_svnlog.py +++ b/tools/bcfg2_svnlog.py @@ -468,7 +468,7 @@ def main(): smtp.sendmail(msg['From'], [msg['To']], msg.as_string()) smtp.quit() else: - print "\n".join(body) + print("\n".join(body)) if __name__ == "__main__": sys.exit(main()) diff --git a/tools/export.py b/tools/export.py index e4f16330d..16229e209 100755 --- a/tools/export.py +++ b/tools/export.py @@ -39,7 +39,7 @@ def run(command): def find_and_replace(f, iftest, rline, startswith=False, dryrun=False): if dryrun: inplace = 0 - print "*** dry-run: New '%s' will look like this:" % f + print("*** dry-run: New '%s' will look like this:" % f) else: inplace = 1 for line in fileinput.input(f, inplace): @@ -52,7 +52,7 @@ def find_and_replace(f, iftest, rline, startswith=False, dryrun=False): line = line.replace(line, rline) sys.stdout.write(line) if dryrun: - print "*** End '%s'" % f + print("*** End '%s'" % f) def main(): @@ -87,8 +87,8 @@ def main(): options = p.parse_args()[0] if options.debug: - print options - print "What should debug mode do?" + print(options) + print("What should debug mode do?") # py3k compatibility try: @@ -113,9 +113,9 @@ def main(): version_info['micro']) if options.debug: - print "version is %s" % version - print "version_info is %s" % version_info - print "version_release is %s" % version_release + print("version is %s" % version) + print("version_info is %s" % version_info) + print("version_release is %s" % version_release) if not version_info["major"].isdigit() \ or not version_info["minor"].isdigit() \ @@ -126,11 +126,11 @@ def main(): 'IFMinorVersion restrictions in ' 'Mac OS X Packaging') except: - print """Version must be of the form Major.Minor.MicroBuild, + print("""Version must be of the form Major.Minor.MicroBuild, where Major and Minor are integers and Micro is a single digit optionally followed by Build (i.e. pre##) E.G. 1.2.0pre1 is a valid version. -""" +""") quit() tarname = '/tmp/%s-%s.tar.gz' % (pkgname, version) @@ -160,8 +160,8 @@ E.G. 1.2.0pre1 is a valid version. f.write(newchangelog + old) f.close() except: - print "Problem opening debian/changelog" - print help_message + print("Problem opening debian/changelog") + print(help_message) quit() # Update redhat directory versions @@ -266,13 +266,13 @@ E.G. 1.2.0pre1 is a valid version. if options.dryrun: for cmd in commando_orders: - print "*** dry-run: %s" % commando[cmd] + print("*** dry-run: %s" % commando[cmd]) else: for cmd in commando_orders: output = run(commando[cmd])[0].strip() if options.verbose: - print output - print "Ran '%s' with above output." % cmd + print(output) + print("Ran '%s' with above output." % cmd) if __name__ == '__main__': sys.exit(main()) diff --git a/tools/selinux_baseline.py b/tools/selinux_baseline.py index 6ddc390a3..b6997bb29 100755 --- a/tools/selinux_baseline.py +++ b/tools/selinux_baseline.py @@ -45,7 +45,7 @@ def main(): entry.tag = "BoundSELinux" baseline.extend(extra) - print lxml.etree.tostring(baseline, pretty_print=True) + print(lxml.etree.tostring(baseline, pretty_print=True)) if __name__ == "__main__": sys.exit(main()) diff --git a/tools/yum-listpkgs-xml.py b/tools/yum-listpkgs-xml.py index 2df5abbcd..a052e75af 100644..100755 --- a/tools/yum-listpkgs-xml.py +++ b/tools/yum-listpkgs-xml.py @@ -19,7 +19,6 @@ def myListPkgs(self, lst, description, outputType): thingslisted = 0 if len(lst) > 0: thingslisted = 1 - #print '%s' % description from yum.misc import sortPkgObj lst.sort(sortPkgObj) for pkg in lst: |