From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 15 Sep 2010 10:52:06 +0000 (+0200)
Subject: import fixing
X-Git-Tag: userdir-ldap-0.3.79~25
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=8276dbab194cd5ca492345a30fc370597dfa2946

import fixing
---

diff --git a/ud-sync-accounts-to-afs b/ud-sync-accounts-to-afs
index 6ce93ef..4fccaa9 100755
--- a/ud-sync-accounts-to-afs
+++ b/ud-sync-accounts-to-afs
@@ -18,11 +18,10 @@ import sys
 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):