Merge branch 'master' into packaging

[pithos] / snf-pithos-tools / pithos / tools / sh.py

diff --git a/pithos/tools/pithos-sh b/snf-pithos-tools/pithos/tools/sh.py
similarity index 99%
rename from pithos/tools/pithos-sh
rename to snf-pithos-tools/pithos/tools/sh.py
index 1047342..dda8e8c 100755 (executable)
--- a/pithos/tools/pithos-sh
+++ b/snf-pithos-tools/pithos/tools/sh.py
@@ -750,6 +750,7 @@ def print_versions(data, f=stdout):
     for id, t in data['versions']:
         f.write('%s @ %s\n' % (str(id).rjust(30), datetime.fromtimestamp(float(t))))
 
+
 def main():
     try:
         name = argv[1]
@@ -769,5 +770,6 @@ def main():
         status = '%s ' % f.status if f.status else ''
         print '%s%s' % (status, f.data)
 
+
 if __name__ == '__main__':
     main()