Commits

Joseph Tate committed 9dee5b2

Fix imports for python2.5

Comments (0)

Files changed (2)

tw2/jqplugins/elfinder/connector/__init__.py

 import webob as wo
 import elFinder
-import json
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 class file_streamer(object):
     def __init__(self, fileobj, buffsize=4096):
             else:
                 start_response("404 NOT FOUND", [('Content-Type', 'text/html')])
                 return ["No handler found for that request",]
-    return elfinder_connector
+    return elfinder_connector

tw2/jqplugins/elfinder/connector/cgi.py

 
 
 import cgi
-import json
+try:
+	import json
+except ImportError:
+	import simplejson as json
 import elFinder
 
 # configure connector options
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.