upstream/ipython Files · IPython/frontend/html/notebook/static/codemirror/README-IPython.rst

Merge pull request from minrk/ipexec_esc...

Merge pull request from minrk/ipexec_esc more general fix for Previously, the extra readline output was only stripped from the front, but I have recently seen it (Python 3.2, OSX 10.7) elsewhere, so the replacement is now a general re.sub.

Brian Granger - - Load All Authors

File last commit:

r6058:ecc950ec


                r6237:3912ea7c

Download file

             README-IPython.rst
        
                    33 lines
            
             | 1.6 KiB
            
                | text/x-rst
            
             |
                RstLexer
            
             / IPython / frontend / html / notebook / static / codemirror / README-IPython.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Fernando Perez
    
Add a README with version and ipython-specific changes info.

              r4982
            
      =======================

       CodeMirror in IPython

      =======================

      We carry a mostly unmodified copy of CodeMirror.  The current version we use

      is (*please update this information when updating versions*)::

        Brian Granger
    
Updating CodeMirror to c813c94 to fix #1344.

              r6058
            
        CodeMirror c813c94

        Fernando Perez
    
Add a README with version and ipython-specific changes info.

              r4982
            
      The only changes we've applied so far are these::

          diff --git a/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js b/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js

          index ca94e7a..fc9a503 100644

          --- a/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js

          +++ b/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js

          @@ -5,7 +5,11 @@ CodeMirror.defineMode("python", function(conf, parserConf) {

      	     return new RegExp("^((" + words.join(")|(") + "))\\b");

      	 }

          -    var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");

          +    // IPython-specific changes: add '?' as recognized character.

          +    //var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");

          +    var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");

          +    // End IPython changes.

          +    

      	 var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');

      	 var doubleOperators = new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");

      	 var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");

      In practice it's just a one-line change, adding `\\?` to singleOperators,

      surrounded by a comment.  We'll turn this into a proper patchset if it ever

      gets more complicated than this, but for now this note should be enough.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Fernando Perez Add a README with version and ipython-specific changes info.	r4982	=======================
		CodeMirror in IPython
		=======================

		We carry a mostly unmodified copy of CodeMirror. The current version we use
		is (please update this information when updating versions)::

Brian Granger Updating CodeMirror to c813c94 to fix #1344.	r6058	CodeMirror c813c94
Fernando Perez Add a README with version and ipython-specific changes info.	r4982
		The only changes we've applied so far are these::

		diff --git a/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js b/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js
		index ca94e7a..fc9a503 100644
		--- a/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js
		+++ b/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js
		@@ -5,7 +5,11 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
		return new RegExp("^((" + words.join(")\|(") + "))\\b");
		}

		- var singleOperators = new RegExp("^[\\+\\-\\*/%&\|\\^~<>!]");
		+ // IPython-specific changes: add '?' as recognized character.
		+ //var singleOperators = new RegExp("^[\\+\\-\\*/%&\|\\^~<>!]");
		+ var singleOperators = new RegExp("^[\\+\\-\\*/%&\|\\^~<>!\\?]");
		+ // End IPython changes.
		+
		var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
		var doubleOperators = new RegExp("^((==)\|(!=)\|(<=)\|(>=)\|(<>)\|(<<)\|(>>)\|(//)\|(\\\\))");
		var doubleDelimiters = new RegExp("^((\\+=)\|(\\-=)\|(\\*=)\|(%=)\|(/=)\|(&=)\|(\\\|=)\|(\\^=))");


		In practice it's just a one-line change, adding `\\?` to singleOperators,
		surrounded by a comment. We'll turn this into a proper patchset if it ever
		gets more complicated than this, but for now this note should be enough.