upstream/ipython Files · IPython/lib/__init__.py

Warn about .py/.json collisions in config...

Warn about .py/.json collisions in config when two versions of the config file set the same value, warn about clobbering, with a message, such as: ``` [TerminalIPythonApp] WARNING | Collisions detected in ipython_config.py and ipython_config.json config files. ipython_config.json has higher priority: { "Klass": { "trait": "'python' ignored, using 'json'" } } ``` In anticipation of more machine-written .json config

Thomas Kluyver - - Load All Authors

File last commit:

r9394:a8b9bab9


                r19160:f22c8070

Download file

             __init__.py
        
                    21 lines
            
             | 785 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / lib / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Brian Granger
    
Fixed import statements for inputhook.

              r2068
            
      # encoding: utf-8

      """

      Extra capabilities for IPython

      """

      #-----------------------------------------------------------------------------

        Matthias BUSSONNIER
    
update copyright to 2011/20xx-2011...

              r5390
            
      #  Copyright (C) 2008-2011  The IPython Development Team

        Brian Granger
    
Fixed import statements for inputhook.

              r2068
            
      #

      #  Distributed under the terms of the BSD License.  The full license is in

      #  the file COPYING, distributed as part of this software.

      #-----------------------------------------------------------------------------

      #-----------------------------------------------------------------------------

      # Imports

      #-----------------------------------------------------------------------------

        Stefan van der Walt
    
Add hashed passphrase generation and verification.

              r5320
            
      from IPython.lib.security import passwd

        Brian Granger
    
Fixed import statements for inputhook.

              r2068
            
      #-----------------------------------------------------------------------------

      # Code

        Brian Granger
    
Updating terminal GUI support to use guisupport.py for qt4/wx.

              r2918
            
      #-----------------------------------------------------------------------------

	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

Brian Granger Fixed import statements for inputhook.	r2068	# encoding: utf-8
		"""
		Extra capabilities for IPython
		"""

		#-----------------------------------------------------------------------------
Matthias BUSSONNIER update copyright to 2011/20xx-2011...	r5390	# Copyright (C) 2008-2011 The IPython Development Team
Brian Granger Fixed import statements for inputhook.	r2068	#
		# Distributed under the terms of the BSD License. The full license is in
		# the file COPYING, distributed as part of this software.
		#-----------------------------------------------------------------------------

		#-----------------------------------------------------------------------------
		# Imports
		#-----------------------------------------------------------------------------

Stefan van der Walt Add hashed passphrase generation and verification.	r5320	from IPython.lib.security import passwd

Brian Granger Fixed import statements for inputhook.	r2068	#-----------------------------------------------------------------------------
		# Code
Brian Granger Updating terminal GUI support to use guisupport.py for qt4/wx.	r2918	#-----------------------------------------------------------------------------