changeset 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 b1c825b2267a
children c1eb8d519084
files MoinMoin/apps/frontend/views.py MoinMoin/items/__init__.py MoinMoin/script/maint/modify_item.py MoinMoin/storage/backends/stores.py
diffstat 4 files changed, 5 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/frontend/views.py	Sun Aug 05 17:09:57 2012 +0200
+++ b/MoinMoin/apps/frontend/views.py	Sun Aug 05 17:22:50 2012 +0200
@@ -19,16 +19,12 @@
 import difflib
 import time
 import mimetypes
+import json
 from datetime import datetime
 from itertools import chain
 from collections import namedtuple
 from functools import wraps, partial
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 from flask import request, url_for, flash, Response, make_response, redirect, session, abort, jsonify
 from flask import current_app as app
 from flask import g as flaskg
--- 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
 
--- a/MoinMoin/script/maint/modify_item.py	Sun Aug 05 17:09:57 2012 +0200
+++ b/MoinMoin/script/maint/modify_item.py	Sun Aug 05 17:22:50 2012 +0200
@@ -6,12 +6,7 @@
 """
 
 import shutil
-
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
+import json
 
 from flask import current_app as app
 from flask import g as flaskg
--- a/MoinMoin/storage/backends/stores.py	Sun Aug 05 17:09:57 2012 +0200
+++ b/MoinMoin/storage/backends/stores.py	Sun Aug 05 17:22:50 2012 +0200
@@ -21,17 +21,14 @@
 
 from __future__ import absolute_import, division
 
+import json
+
 from MoinMoin.config import REVID, DATAID, SIZE, HASH_ALGORITHM
 from MoinMoin.util.crypto import make_uuid
 
 from . import BackendBase, MutableBackendBase
 from ._util import TrackingFileWrapper
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 STORES_PACKAGE = 'MoinMoin.storage.stores'