diff options
author | Sol Jerome <solj@ices.utexas.edu> | 2009-01-15 04:04:45 +0000 |
---|---|---|
committer | Sol Jerome <solj@ices.utexas.edu> | 2009-01-15 04:04:45 +0000 |
commit | 240a6cd174d56b0d57b826ce537e4b740f509fa5 (patch) | |
tree | 0a8f1a86552b36296e2e1c9a30b111f4d2fde0f8 /src | |
parent | 522d1758b824a69fa196cee412532d6cefcd9a62 (diff) | |
download | bcfg2-240a6cd174d56b0d57b826ce537e4b740f509fa5.tar.gz bcfg2-240a6cd174d56b0d57b826ce537e4b740f509fa5.tar.bz2 bcfg2-240a6cd174d56b0d57b826ce537e4b740f509fa5.zip |
Revert accidental svn keyword changes and add minor pylint fixes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5027 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/Options.py | 2 | ||||
-rwxr-xr-x | src/lib/Server/Reports/importscript.py | 2 | ||||
-rwxr-xr-x | src/sbin/bcfg2-info | 9 | ||||
-rwxr-xr-x | src/sbin/bcfg2-server | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py index fd31fa05b..dd9557521 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -1,5 +1,5 @@ '''Option parsing library for utilities''' -__revision__ = '$Revision: 5000 $' +__revision__ = '$Revision$' import getopt, os, socket, sys, ConfigParser, Bcfg2.Client.Tools diff --git a/src/lib/Server/Reports/importscript.py b/src/lib/Server/Reports/importscript.py index bb26647f2..174f7f639 100755 --- a/src/lib/Server/Reports/importscript.py +++ b/src/lib/Server/Reports/importscript.py @@ -1,6 +1,6 @@ #! /usr/bin/env python '''Imports statistics.xml and clients.xml files in to database backend for new statistics engine''' -__revision__ = '$Revision: 4999 $' +__revision__ = '$Revision$' import os, sys, binascii try: diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index cf369bd4d..bd04b599a 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -1,8 +1,8 @@ #!/usr/bin/python -i '''This tool loads the Bcfg2 core into an interactive debugger''' -__revision__ = '$Revision: 5014 $' +__revision__ = '$Revision$' -import copy, logging, lxml.etree, sys, time, cmd +import copy, logging, lxml.etree, sys, cmd import Bcfg2.Logger, Bcfg2.Server.Core, os import Bcfg2.Server.Plugins.Metadata, Bcfg2.Server.Plugin import Bcfg2.Options @@ -14,7 +14,8 @@ class dummyError(Exception): def printTabular(rows): '''print data in tabular format''' - cmax = tuple([max([len(str(row[index])) for row in rows]) + 1 for index in xrange(len(rows[0]))]) + cmax = tuple([max([len(str(row[index])) for row in rows]) + 1 \ + for index in xrange(len(rows[0]))]) fstring = (" %%-%ss |" * len(cmax)) % cmax fstring = ('|'.join([" %%-%ss "] * len(cmax))) % cmax print fstring % rows[0] @@ -282,7 +283,7 @@ Usage: [quit|exit]""" [cand.remove(c) for c in cand[:] if getattr(c.specific, field)] if len(cand) != 1: - print >>sys.stderr, "Entry %s failed" % cfile.get('name') + sys.stderr.write("Entry %s failed" % cfile.get('name')) continue print cand[0].name diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 48619c124..0c1c5d01c 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -1,7 +1,7 @@ #!/usr/bin/env python '''The XML-RPC Bcfg2 Server''' -__revision__ = '$Revision: 5014 $' +__revision__ = '$Revision$' import Bcfg2.Server.Plugins.Metadata |