projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e14c30b
)
import fixing
author
Peter Palfrader
<peter@palfrader.org>
Wed, 15 Sep 2010 10:52:06 +0000
(12:52 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 15 Sep 2010 10:52:06 +0000
(12:52 +0200)
ud-sync-accounts-to-afs
patch
|
blob
|
history
diff --git
a/ud-sync-accounts-to-afs
b/ud-sync-accounts-to-afs
index
6ce93ef
..
4fccaa9
100755
(executable)
--- a/
ud-sync-accounts-to-afs
+++ b/
ud-sync-accounts-to-afs
@@
-18,11
+18,10
@@
import sys
import tempfile
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
import simplejson as json
+except ImportError:
+ import json # this better be pthon 2.6's json..
class UserEntries:
def __init__(self):
class UserEntries:
def __init__(self):