build: Use mdwsetup.py from new CFD. Announce 1.0.2.

[catacomb-python] / pwsafe

diff --git a/pwsafe b/pwsafe
index 3485b08..52f9abb 100755 (executable)
--- a/pwsafe
+++ b/pwsafe
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.2
+#! /usr/bin/python

 # -*-python-*-
 
 import catacomb as C
 # -*-python-*-
 
 import catacomb as C


@@ -8,7 +8,7 @@ from os import environ
 from sys import argv, exit, stdin, stdout, stderr
 from getopt import getopt, GetoptError
 from fnmatch import fnmatch
 from sys import argv, exit, stdin, stdout, stderr
 from getopt import getopt, GetoptError
 from fnmatch import fnmatch

-import sre as re
+import re

 
 prog = re.sub(r'^.*[/\\]', '', argv[0])
 def moan(msg):
 
 prog = re.sub(r'^.*[/\\]', '', argv[0])
 def moan(msg):


@@ -166,15 +166,15 @@ def cmd_dump(av):
     k = db.nextkey(k)
 
 commands = { 'create': [cmd_create,
     k = db.nextkey(k)
 
 commands = { 'create': [cmd_create,

-                        '[-c CIPHER] [-h HASH] [-m MAC] [PP-TAG]'],
-             'find' : [cmd_find, 'LABEL'],
-             'store' : [cmd_store, 'LABEL [VALUE]'],
-             'list' : [cmd_list, '[GLOB-PATTERN]'],
-             'changepp' : [cmd_changepp, ''],
-             'copy' : [cmd_copy, 'DEST-FILE [GLOB-PATTERN]'],
-             'to-pixie' : [cmd_topixie, '[TAG [PIXIE-TAG]]'],
-             'delete' : [cmd_del, 'TAG'],
-             'dump' : [cmd_dump, '']}
+                       '[-c CIPHER] [-h HASH] [-m MAC] [PP-TAG]'],
+            'find' : [cmd_find, 'LABEL'],
+            'store' : [cmd_store, 'LABEL [VALUE]'],
+            'list' : [cmd_list, '[GLOB-PATTERN]'],
+            'changepp' : [cmd_changepp, ''],
+            'copy' : [cmd_copy, 'DEST-FILE [GLOB-PATTERN]'],
+            'to-pixie' : [cmd_topixie, '[TAG [PIXIE-TAG]]'],
+            'delete' : [cmd_del, 'TAG'],
+            'dump' : [cmd_dump, '']}

 
 def version():
   print '%s 1.0.0' % prog
 
 def version():
   print '%s 1.0.0' % prog


@@ -183,7 +183,7 @@ def usage(fp):
 def help():
   version()
   print
 def help():
   version()
   print

-  usage(stdout)  
+  usage(stdout)

   print '''
 Maintains passwords or other short secrets securely.
 
   print '''
 Maintains passwords or other short secrets securely.
 


@@ -202,8 +202,8 @@ Commands provided:
 
 try:
   opts, argv = getopt(argv[1:],
 
 try:
   opts, argv = getopt(argv[1:],

-                      'hvuf:',
-                      ['help', 'version', 'usage', 'file='])
+                     'hvuf:',
+                     ['help', 'version', 'usage', 'file='])

 except GetoptError:
   usage(stderr)
   exit(1)
 except GetoptError:
   usage(stderr)
   exit(1)