import tempfile
-import json
-if not '__author__' in json.__dict__:
- sys.stderr.write("Warning: This is probably the wrong json module. We want python 2.6's json\n")
- sys.stderr.write("module, or simplejson on python 2.5. Let's see if/how stuff blows up.\n")
+try:
import simplejson as json
+except ImportError:
+ import json # this better be pthon 2.6's json..
class UserEntries:
def __init__(self):
if n == 'anonymous': # keep account, so remove from the have list
a.del_name(n)
continue
- m = re.match('[0-9a-z]+$', n)
+ m = re.match('[0-9a-z-]+$', n)
if not m: # weird name, probably has dots like weasel.admin etc.
a.del_name(n)
continue
want = load_expected()
have = load_existing()
- if not options.user in have.by_name:
+ if options.user not in have.by_name:
print >> sys.stderr, "Cannot find our user, '%s', in pts listentries"%(options.user)
sys.exit(1)
me = have.by_name[options.user]