diff MoinMoin/items/__init__.py @ 1623:1e67974bee6e

remove simplejson fallback, json is included since python 2.6 (which we require)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 05 Aug 2012 17:22:50 +0200
parents 8f0a17a04e60
children c1eb8d519084
line wrap: on
line diff
--- a/MoinMoin/items/__init__.py	Sun Aug 05 17:09:57 2012 +0200
+++ b/MoinMoin/items/__init__.py	Sun Aug 05 17:22:50 2012 +0200
@@ -19,6 +19,7 @@
 
 import re, time
 import itertools
+import json
 from StringIO import StringIO
 from collections import namedtuple
 from functools import partial
@@ -38,11 +39,6 @@
 from MoinMoin import log
 logging = log.getLogger(__name__)
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 from flask import current_app as app
 from flask import g as flaskg