reverted 4622 codemirror3 because broke zencoding and drops support for IE7, we do not use the new features anyway. Sorry

applications/admin/static/codemirror/mode/python/index.html

@@ -5,7 +5,6 @@
     <title>CodeMirror: Python mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/matchbrackets.js"></script>
     <script src="python.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>

applications/admin/static/codemirror/mode/python/python.js

@@ -160,7 +160,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         var singleline = delimiter.length == 1;
         var OUTCLASS = 'string';
         
-        function tokenString(stream, state) {
+        return function tokenString(stream, state) {
             while (!stream.eol()) {
                 stream.eatWhile(/[^'"\\]/);
                 if (stream.eat('\\')) {
@@ -183,9 +183,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
                 }
             }
             return OUTCLASS;
-        }
-        tokenString.isString = true;
-        return tokenString;
+        };
     }
     
     function indent(stream, state, type) {
@@ -325,9 +323,9 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             return style;
         },
         
-        indent: function(state) {
+        indent: function(state, textAfter) {
             if (state.tokenize != tokenBase) {
-                return state.tokenize.isString ? CodeMirror.Pass : 0;
+                return 0;
             }
             
             return state.scopes[0].offset;