Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -r 927884423740 MoinMoin/items/__init__.py
- --- a/MoinMoin/items/__init__.py Wed Dec 01 13:42:39 2010 +0100
- +++ b/MoinMoin/items/__init__.py Fri Dec 03 16:20:50 2010 -0600
- @@ -20,7 +20,7 @@
- import zipfile
- import tempfile
- from StringIO import StringIO
- -import json
- +
- import hashlib
- try:
- @@ -33,6 +33,11 @@
- 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 flaskg
- diff -r 927884423740 MoinMoin/static/applets/svg-edit/extras/update-langs.py
- --- a/MoinMoin/static/applets/svg-edit/extras/update-langs.py Wed Dec 01 13:42:39 2010 +0100
- +++ b/MoinMoin/static/applets/svg-edit/extras/update-langs.py Fri Dec 03 16:20:50 2010 -0600
- @@ -10,7 +10,10 @@
- Copyright (c) 2010 Jeff Schiller
- """
- import os
- -import json
- +try:
- + import json
- +except ImportError:
- + import simplejson as json
- from types import DictType
- def changeTooltipTarget(j):
Add Comment
Please, Sign In to add comment
