changeset 296 | 6feeef02c057 |
parent 295 | 9741d82e5b1e |
child 307 | 9009a37ad45b |
--- 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() +