# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1302801683 -3600
# Node ID 6feeef02c05791de070509d78981d0b47d7d1e89
# Parent  9741d82e5b1ea3d885cfb5d112b24c3b343857ad
Prefer import json over import simplejson

diff -r 9741d82e5b1e -r 6feeef02c057 src/mercurialserver/servelog.py
--- a/src/mercurialserver/servelog.py	Thu Jan 20 21:18:29 2011 +0100
+++ b/src/mercurialserver/servelog.py	Thu Apr 14 18:21:23 2011 +0100
@@ -9,8 +9,12 @@
 import os
 import time
 import fcntl
-try: import simplejson as json
-except ImportError: import json
+
+try: 
+    import json
+except ImportError: 
+    import simplejson as json
+
 from mercurialserver import ruleset, changes
 
 def hook(ui, repo, hooktype, node=None, source=None, **kwargs):
@@ -36,3 +40,4 @@
          )))
     finally:
         log.close()
+