Merge lp:~happyhouse19/ubuntu/oneiric/spyder/fix-for-890243 into lp:ubuntu/oneiric/spyder

[Matthew Goode]

Added a line to the spyder.desktop file so that the icon will display in the Unity launcher. This fix was done in Oneiric, but also works in Precise.

[Didier Roche-Tolomelli (didrocks)]

Hey Matthew.

Thanks for the patch! I have some notes though:
- you didn't target the right branch (you targeted the oneiric branch, not precise one)
- debian/changelog target "oneiric" and not "precise" :)
- also, you made an inline patch. We tend to avoid doing that and using a patch system (this one is using quilt). For more information please look at https://wiki.ubuntu.com/PackagingGuide.
- finally, this patch should definitively be sent to upstream (eventually debian). Can you please take care of that?

Anyway, I've fixed the 3 first bullet and sponsored to precise. Thanks! Marking the branch as merged.

review: Approve

[Matthew Goode (happyhouse19)]

Apologies for not quite doing it right. I was trying to follow https://wiki.ubuntu.com/Bugs/HowToFix, as I have not submitted a fix before, but thanks for tidying this up for me. I am happy to send this patch upstream. Is there a useful page showing me how to do this so I make sure I do it correct?

Unmerged revisions

12. By Matthew Goode on 2012-03-27

Added icon entry to spyder.desktop (LP: #890243)

11. By Picca Frederic-Emmanuel on 2012-02-20

* Imported Upstream version 2.1.8
* prepare for backport

10. By Picca Frederic-Emmanuel on 2012-01-16

Imported Upstream version 2.1.7

9. By Matthias Klose on 2011-12-31

Rebuild to drop python2.6 dependencies.

=== added file '.pc/0001-fix-documentation-installation.patch/setup.py'
--- .pc/0001-fix-documentation-installation.patch/setup.py	1970-01-01 00:00:00 +0000
+++ .pc/0001-fix-documentation-installation.patch/setup.py	2012-03-27 18:05:23 +0000
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © 2009-2010 Pierre Raybaut
+# Licensed under the terms of the MIT License
+# (see spyderlib/__init__.py for details)
+
+"""
+Spyder
+======
+
+The Scientific PYthon Development EnviRonment
+"""
+
+from distutils.core import setup
+from distutils.command.build import build
+from sphinx import setup_command
+import os
+import os.path as osp
+import sys
+
+
+def get_package_data(name, extlist):
+    """Return data files for package *name* with extensions in *extlist*"""
+    flist = []
+    # Workaround to replace os.path.relpath (not available until Python 2.6):
+    offset = len(name)+len(os.pathsep)
+    for dirpath, _dirnames, filenames in os.walk(name):
+        for fname in filenames:
+            if not fname.startswith('.') and osp.splitext(fname)[1] in extlist:
+                flist.append(osp.join(dirpath, fname)[offset:])
+    return flist
+
+
+def get_subpackages(name):
+    """Return subpackages of package *name*"""
+    splist = []
+    for dirpath, _dirnames, _filenames in os.walk(name):
+        if osp.isfile(osp.join(dirpath, '__init__.py')):
+            splist.append(".".join(dirpath.split(os.sep)))
+    return splist
+
+
+# Sphinx build (documentation)
+class MyBuild(build):
+    def has_doc(self):
+        setup_dir = os.path.dirname(os.path.abspath(__file__))
+        return os.path.isdir(os.path.join(setup_dir, 'doc'))
+    sub_commands = build.sub_commands + [('build_doc', has_doc)]
+
+
+class MyBuildDoc(setup_command.BuildDoc):
+    def run(self):
+        build = self.get_finalized_command('build')
+        sys.path.insert(0, os.path.abspath(build.build_lib))
+        dirname = self.distribution.get_command_obj('build').build_purelib
+        self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+        try:
+            setup_command.BuildDoc.run(self)
+        except UnicodeDecodeError:
+            print >>sys.stderr, "ERROR: unable to build documentation because Sphinx do not handle source path with non-ASCII characters. Please try to move the source package to another location (path with *only* ASCII characters)."        
+        sys.path.pop(0)
+
+
+cmdclass = {'build': MyBuild, 'build_doc': MyBuildDoc}
+
+
+NAME = 'spyder'
+LIBNAME = 'spyderlib'
+from spyderlib import __version__, __project_url__
+
+setup(name=NAME,
+      version=__version__,
+      description='Scientific PYthon Development EnviRonment',
+      long_description="""The spyderlib library provides powerful console and 
+editor related widgets to your Qt application (PyQt4 or PySide). It also 
+includes a Scientific Python development environment named 'Spyder', an 
+alternative to IDLE with powerful interactive features such as variable 
+explorer (with GUI-based editors for dictionaries, lists, NumPy arrays, etc.), 
+object inspector, online help, and a lot more.""",
+      download_url='%s/files/%s-%s.zip' % (__project_url__, NAME, __version__),
+      author="Pierre Raybaut",
+      url=__project_url__,
+      license='MIT',
+      keywords='PyQt4 PySide editor shell console widgets IDE',
+      platforms=['any'],
+      packages=get_subpackages(LIBNAME)+get_subpackages('spyderplugins'),
+      package_data={LIBNAME:
+                    get_package_data(LIBNAME, ('.mo', '.svg', '.png', '.css')),
+                    'spyderplugins':
+                    get_package_data('spyderplugins', ('.mo', '.svg', '.png'))},
+      requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"],
+      scripts=[osp.join('scripts', fname) for fname in 
+               (['spyder', 'spyder.bat'] if os.name == 'nt' else ['spyder'])],
+      classifiers=['License :: OSI Approved :: MIT License',
+                   'Operating System :: MacOS',
+                   'Operating System :: Microsoft :: Windows',
+                   'Operating System :: OS Independent',
+                   'Operating System :: POSIX',
+                   'Operating System :: Unix',
+                   'Programming Language :: Python :: 2.5',
+                   'Programming Language :: Python :: 2.6',
+                   'Programming Language :: Python :: 2.7',
+                   'Development Status :: 5 - Production/Stable',
+                   'Topic :: Scientific/Engineering',
+                   'Topic :: Software Development :: Widget Sets'],
+      cmdclass=cmdclass)

=== added file '.pc/0001-fix-documentation-installation.patch/spyderlib/__init__.py'
--- .pc/0001-fix-documentation-installation.patch/spyderlib/__init__.py	1970-01-01 00:00:00 +0000
+++ .pc/0001-fix-documentation-installation.patch/spyderlib/__init__.py	2012-03-27 18:05:23 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+"""
+Spyder License Agreement (MIT License)
+--------------------------------------
+
+Copyright (c) 2009-2011 Pierre Raybaut
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+"""
+
+__version__ = '2.1.8'
+__license__ = __doc__
+__project_url__ = 'http://code.google.com/p/spyderlib'
+__forum_url__   = 'http://groups.google.com/group/spyderlib'
+
+# Dear (Debian, RPM, ...) package makers, please feel free to customize the
+# following path to module's data (images) and translations:
+DATAPATH = LOCALEPATH = DOCPATH = ''
+
+def add_to_distribution(dist):
+    """Add package to py2exe/cx_Freeze distribution object
+    Extension to guidata.disthelpers"""
+    dist.add_modules('PyQt4')
+    for _modname in ('spyderlib', 'spyderplugins'):
+        dist.add_module_data_files(_modname, ("", ),
+                                   ('.png', '.svg', '.html', '.png', '.txt',
+                                    '.js', '.inv', '.ico', '.css', '.doctree',
+                                    '.qm', '.py',),
+                                   copy_to_root=False)

=== removed file '.pc/0001-fix-documentation-installation.patch/spyderlib/config.py'
--- .pc/0001-fix-documentation-installation.patch/spyderlib/config.py	2011-04-29 21:19:10 +0000
+++ .pc/0001-fix-documentation-installation.patch/spyderlib/config.py	1970-01-01 00:00:00 +0000
@@ -1,506 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2009-2010 Pierre Raybaut
-# Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
-
-"""
-Spyder configuration management
-
-Important note regarding shortcuts:
-    For compatibility with QWERTZ keyboards, one must avoid using the following
-    shortcuts:
-        Ctrl + Alt + Q, W, F, G, Y, X, C, V, B, N
-"""
-
-import os, sys, os.path as osp
-from datetime import date
-from PyQt4.QtGui import QLabel, QIcon, QPixmap, QFont, QFontDatabase
-
-# Local import
-from userconfig import UserConfig, get_home_dir, NoDefault
-
-DATA_DEV_PATH = osp.dirname(__file__)
-if not osp.isdir(DATA_DEV_PATH):
-    # Assuming py2exe distribution
-    DATA_DEV_PATH = osp.join(sys.prefix, "spyderlib")
-DOC_DEV_PATH = osp.join(DATA_DEV_PATH, 'doc')
-
-# The two following lines are patched when making the debian package:
-DATA_PATH = DATA_DEV_PATH # @@@DATA_PATH@@@
-DOC_PATH = DOC_DEV_PATH # @@@DOC_PATH@@@
-
-EDITABLE_TYPES = [int, long, float, list, dict, tuple, str, unicode, date]
-try:
-    from numpy import ndarray, matrix
-    EDITABLE_TYPES += [ndarray, matrix]
-except ImportError:
-    pass
-PICKLABLE_TYPES = EDITABLE_TYPES[:]
-try:
-    from PIL.Image import Image
-    EDITABLE_TYPES.append(Image)
-except ImportError:
-    pass
-
-# Max number of filter iterations for worskpace display:
-# (for workspace saving, itermax == -1, see Workspace.save)
-ITERMAX = -1 #XXX: To be adjusted if it takes too much to compute... 2, 3?
-
-EXCLUDED = ['nan', 'inf', 'infty', 'little_endian', 'colorbar_doc', 'typecodes',
-            '__builtins__', '__main__', '__doc__']
-
-def type2str(types):
-    """Convert types to strings"""
-    return [typ.__name__ for typ in types]
-
-def str2type(strings):
-    """Convert strings to types"""
-    return tuple( [eval(string) for string in strings] )
-
-SANS_SERIF = ['Sans Serif', 'DejaVu Sans', 'Bitstream Vera Sans',
-              'Bitstream Charter', 'Lucida Grande', 'Verdana', 'Geneva',
-              'Lucid', 'Arial', 'Helvetica', 'Avant Garde', 'sans-serif']
-SANS_SERIF.insert(0, unicode(QFont().family()))
-
-MONOSPACE = ['Monospace', 'DejaVu Sans Mono', 'Consolas', 'Courier New',
-             'Bitstream Vera Sans Mono', 'Andale Mono', 'Liberation Mono',
-             'Monaco', 'Courier', 'monospace', 'Fixed', 'Terminal']
-MEDIUM = 10
-SMALL = 9
-
-DEFAULTS = [
-            ('main',
-             {
-              'translation': True,
-              'vertical_dockwidget_titlebars': False,
-              'vertical_tabs': False,
-              'animated_docks': True,
-              'window/size': (1260, 740),
-              'window/position': (10, 10),
-              'window/is_maximized': False,
-              'window/is_fullscreen': False,
-              'lightwindow/size': (650, 400),
-              'lightwindow/position': (30, 30),
-              'lightwindow/is_maximized': False,
-              'lightwindow/is_fullscreen': False,
-              }),
-            ('editor_appearance',
-             {
-              'cursor/width': 2,
-              'calltips/font/family': MONOSPACE,
-              'calltips/font/size': SMALL,
-              'calltips/font/italic': False,
-              'calltips/font/bold': False,
-              'calltips/size': 600,
-              'completion/font/family': MONOSPACE,
-              'completion/font/size': SMALL,
-              'completion/font/italic': False,
-              'completion/font/bold': False,
-              'completion/size': (300, 180),
-              }),
-            ('shell_appearance',
-             {
-              'cursor/width': 2,
-              'calltips/font/family': MONOSPACE,
-              'calltips/font/size': SMALL,
-              'calltips/font/italic': False,
-              'calltips/font/bold': False,
-              'calltips/size': 600,
-              'completion/font/family': MONOSPACE,
-              'completion/font/size': SMALL,
-              'completion/font/italic': False,
-              'completion/font/bold': False,
-              'completion/size': (300, 180),
-              }),
-            ('internal_console',
-             {
-              'max_line_count': 300,
-              'working_dir_history': 30,
-              'working_dir_adjusttocontents': False,
-              'font/family': MONOSPACE,
-              'font/size': MEDIUM,
-              'font/italic': False,
-              'font/bold': False,
-              'wrap': True,
-              'calltips': True,
-              'codecompletion/auto': False,
-              'codecompletion/enter_key': True,
-              'codecompletion/case_sensitive': True,
-              'codecompletion/show_single': False,
-              'external_editor/path': 'SciTE',
-              'external_editor/gotoline': '-goto:',
-              'light_background': True,
-              }),
-            ('console',
-             {
-              'shortcut': "Ctrl+Shift+C",
-              'max_line_count': 10000,
-              'font/family': MONOSPACE,
-              'font/size': MEDIUM,
-              'font/italic': False,
-              'font/bold': False,
-              'wrap': True,
-              'single_tab': True,
-              'calltips': True,
-              'object_inspector': True,
-              'codecompletion/auto': True,
-              'codecompletion/enter_key': True,
-              'codecompletion/case_sensitive': True,
-              'codecompletion/show_single': False,
-              'show_elapsed_time': True,
-              'show_icontext': False,
-              'monitor/enabled': True,
-              'mpl_patch/enabled': True,
-              'mpl_patch/backend': 'Qt4Agg',
-              'umd/enabled': True,
-              'umd/verbose': True,
-              'umd/namelist': ['guidata', 'guiqwt'],
-              'light_background': True,
-              'ipython_set_color': True,
-              'remove_pyqt_inputhook': os.name == 'nt',
-              'ignore_sip_setapi_errors': True,
-              }),
-            ('variable_explorer',
-             {
-              'shortcut': "Ctrl+Shift+V",
-              'autorefresh': True,
-              'autorefresh/timeout': 2000,
-              'editable_types': type2str(EDITABLE_TYPES),
-              'picklable_types': type2str(PICKLABLE_TYPES),
-              'itermax': ITERMAX,
-              'excluded_names': EXCLUDED,
-              'exclude_private': True,
-              'exclude_upper': True,
-              'exclude_unsupported': True,
-              'inplace': False,
-              'truncate': True,
-              'minmax': False,
-              'collvalue': False,
-              'remote_editing': True,
-              }),
-            ('editor',
-             {
-              'shortcut': "Ctrl+Shift+E",
-              'printer_header/font/family': SANS_SERIF,
-              'printer_header/font/size': MEDIUM,
-              'printer_header/font/italic': False,
-              'printer_header/font/bold': False,
-              'font/family': MONOSPACE,
-              'font/size': MEDIUM,
-              'font/italic': False,
-              'font/bold': False,
-              'wrap': False,
-              'wrapflag': True,
-              'code_analysis': True,
-              'todo_list': True,
-              'realtime_analysis': True,
-              'realtime_analysis/timeout': 2500,
-              'outline_explorer': True,
-              'line_numbers': True,
-              'edge_line': True,
-              'edge_line_column': 80,
-              'toolbox_panel': True,
-              'calltips': True,
-              'go_to_definition': True,
-              'close_parentheses': True,
-              'auto_unindent': True,
-              'object_inspector': True,
-              'codecompletion/auto': True,
-              'codecompletion/enter_key': True,
-              'codecompletion/case_sensitive': True,
-              'codecompletion/show_single': False,
-              'check_eol_chars': True,
-              'tab_always_indent': False,
-              'intelligent_backspace': True,
-              'highlight_current_line': True,
-              'occurence_highlighting': True,
-              'fullpath_sorting': True,
-              'show_tab_bar': True,
-              'max_recent_files': 20,
-              }),
-            ('historylog',
-             {
-              'shortcut': "Ctrl+Shift+H",
-              'enable': True,
-              'max_entries': 100,
-              'font/family': MONOSPACE,
-              'font/size': MEDIUM,
-              'font/italic': False,
-              'font/bold': False,
-              'wrap': True,
-              }),
-            ('inspector',
-             {
-              'shortcut': "Ctrl+Shift+I",
-              'enable': True,
-              'max_history_entries': 20,
-              'font/family': MONOSPACE,
-              'font/size': SMALL,
-              'font/italic': False,
-              'font/bold': False,
-              'rich_text/font/family': SANS_SERIF,
-              'rich_text/font/size': 11,
-              'rich_text/font/italic': False,
-              'rich_text/font/bold': False,
-              'wrap': True,
-              'automatic_import': True,
-              }),
-            ('onlinehelp',
-             {
-              'shortcut': "Ctrl+Shift+D",
-              'enable': True,
-              'zoom_factor': .8,
-              'max_history_entries': 20,
-              }),
-            ('project_explorer',
-             {
-              'shortcut': "Ctrl+Shift+P",
-              'enable': True,
-              }),
-            ('arrayeditor',
-             {
-              'font/family': MONOSPACE,
-              'font/size': SMALL,
-              'font/italic': False,
-              'font/bold': False,
-              }),
-            ('texteditor',
-             {
-              'font/family': MONOSPACE,
-              'font/size': MEDIUM,
-              'font/italic': False,
-              'font/bold': False,
-              }),
-            ('dicteditor',
-             {
-              'font/family': MONOSPACE,
-              'font/size': SMALL,
-              'font/italic': False,
-              'font/bold': False,
-              }),
-            ('explorer',
-             {
-              'enable': True,
-              'wrap': True,
-              'name_filters': ['*.py', '*.pyw', '*.ipy', '*.pth',
-                               '*.npy', '*.mat', '*.spydata',
-                               '*.txt', '*.csv', '*.dat'],
-              'valid_filetypes': ['', '.py', '.pyw', '.ipy', '.spydata', '.npy',
-                                  '.pth', '.txt', '.csv', '.mat', '.h5'],
-              'show_hidden': True,
-              'show_all': False,
-              'show_toolbar': True,
-              'show_icontext': True,
-              }),
-            ('find_in_files',
-             {
-              'enable': True,
-              'supported_encodings': ["utf-8", "iso-8859-1", "cp1252"],
-              'include': [r'\.pyw?$|\.ipy$|\.txt$|\.c$|\.cpp$|\.h$|\.hpp$|\.f$|\.ini$', '.'],
-              'include_regexp': True,
-              'exclude': [r'\.pyc$|\.pyo$|\.orig$|\.hg|\.svn'],
-              'exclude_regexp': True,
-              'search_text_regexp': True,
-              'search_text': [''],
-              'search_text_samples': [r'# ?TODO|# ?FIXME|# ?XXX|# ?HINT|# ?TIP'],
-              'in_python_path': False,
-              'more_options': True,
-              }),
-            ]
-
-DEV = not __file__.startswith(sys.prefix)
-DEV = False
-from spyderlib import __version__
-_subfolder = '.spyder%s' % __version__.split('.')[0]
-CONF = UserConfig('spyder', defaults=DEFAULTS, load=(not DEV), version='2.0.6',
-                  subfolder=_subfolder, backup=True, raw_mode=True)
-# Removing old .spyder.ini location:
-old_location = osp.join(get_home_dir(), '.spyder.ini')
-if osp.isfile(old_location):
-    os.remove(old_location)
-
-
-# Translation support
-if CONF.get('main', 'translation'):
-    from spyderlib.utils.translations import get_translation
-    _ = get_translation("spyderlib")
-else:
-    _ = lambda x: x
-
-
-def get_conf_path(filename=None):
-    """Return absolute path for configuration file with specified filename"""
-    conf_dir = osp.join(get_home_dir(), _subfolder)
-    if not osp.isdir(conf_dir):
-        os.mkdir(conf_dir)
-    if filename is None:
-        return conf_dir
-    else:
-        return osp.join(conf_dir, filename)
-
-IMG_PATH = []
-def add_image_path(path):
-    if not osp.isdir(path):
-        return
-    global IMG_PATH
-    IMG_PATH.append(path)
-    for _root, dirs, _files in os.walk(path):
-        for dir in dirs:
-            IMG_PATH.append(osp.join(path, dir))
-
-add_image_path(osp.join(DATA_PATH, 'images'))
-
-def get_image_path( name, default="not_found.png" ):
-    """Return image absolute path"""
-    for img_path in IMG_PATH:
-        full_path = osp.join(img_path, name)
-        if osp.isfile(full_path):
-            return osp.abspath(full_path)
-    if default is not None:
-        return osp.abspath(osp.join(img_path, default))
-
-def get_icon( name, default=None ):
-    """Return image inside a QIcon object"""
-    if default is None:
-        return QIcon(get_image_path(name))
-    elif isinstance(default, QIcon):
-        icon_path = get_image_path(name, default=None)
-        return default if icon_path is None else QIcon(icon_path)
-    else:
-        return QIcon(get_image_path(name, default))
-
-def get_image_label( name, default="not_found.png" ):
-    """Return image inside a QLabel object"""
-    label = QLabel()
-    label.setPixmap(QPixmap(get_image_path(name, default)))
-    return label
-
-def font_is_installed(font):
-    """Check if font is installed"""
-    return [fam for fam in QFontDatabase().families() if unicode(fam)==font]
-    
-def get_family(families):
-    """Return the first installed font family in family list"""
-    if not isinstance(families, list):
-        families = [ families ]
-    for family in families:
-        if font_is_installed(family):
-            return family
-    else:
-        print "Warning: None of the following fonts is installed: %r" % families
-        return QFont().family()
-    
-FONT_CACHE = {}
-def get_font(section, option=None):
-    """Get console font properties depending on OS and user options"""
-    font = FONT_CACHE.get((section, option))
-    if font is None:
-        if option is None:
-            option = 'font'
-        else:
-            option += '/font'
-        families = CONF.get(section, option+"/family", None)
-        if families is None:
-            return QFont()
-        family = get_family(families)
-        weight = QFont.Normal
-        italic = CONF.get(section, option+'/italic', False)
-        if CONF.get(section, option+'/bold', False):
-            weight = QFont.Bold
-        size = CONF.get(section, option+'/size', 9)
-        font = QFont(family, size, weight)
-        font.setItalic(italic)
-        FONT_CACHE[(section, option)] = font
-    return font
-
-def set_font(font, section, option=None):
-    """Set font"""
-    if option is None:
-        option = 'font'
-    else:
-        option += '/font'
-    CONF.set(section, option+'/family', unicode(font.family()))
-    CONF.set(section, option+'/size', float(font.pointSize()))
-    CONF.set(section, option+'/italic', int(font.italic()))
-    CONF.set(section, option+'/bold', int(font.bold()))
-    FONT_CACHE[(section, option)] = font
-
-
-def get_shortcut(context, name, default=NoDefault):
-    """Get keyboard shortcut (key sequence string)"""
-    return CONF.get('shortcuts', '%s/%s' % (context, name), default=default)
-
-def set_shortcut(context, name, keystr):
-    """Set keyboard shortcut (key sequence string)"""
-    CONF.set('shortcuts', '%s/%s' % (context, name), keystr)
-    
-def iter_shortcuts():
-    """Iterate over keyboard shortcuts"""
-    for option in CONF.options('shortcuts'):
-        context, name = option.split("/", 1)
-        yield context, name, get_shortcut(context, name)
-        
-def reset_shortcuts():
-    """Reset keyboard shortcuts to default values"""
-    CONF.remove_section('shortcuts')
-
-
-from spyderlib.widgets.sourcecode.syntaxhighlighters import (
-                                COLOR_SCHEME_KEYS, COLOR_SCHEME_NAMES, COLORS)
-def get_color_scheme(name):
-    """Get syntax color scheme"""
-    color_scheme = {}
-    for key in COLOR_SCHEME_KEYS:
-        color_scheme[key] = CONF.get("color_schemes", "%s/%s" % (name, key))
-    return color_scheme
-
-def set_color_scheme(name, color_scheme, replace=True):
-    """Set syntax color scheme"""
-    section = "color_schemes"
-    names = CONF.get("color_schemes", "names", [])
-    for key in COLOR_SCHEME_KEYS:
-        option = "%s/%s" % (name, key)
-        value = CONF.get(section, option, default=None)
-        if value is None or replace or name not in names:
-            CONF.set(section, option, color_scheme[key])
-    names.append(unicode(name))
-    CONF.set(section, "names", sorted(list(set(names))))
-
-def set_default_color_scheme(name, replace=True):
-    """Reset color scheme to default values"""
-    assert name in COLOR_SCHEME_NAMES
-    set_color_scheme(name, COLORS[name], replace=replace)
-
-for _name in COLOR_SCHEME_NAMES:
-    set_default_color_scheme(_name, replace=False)
-CUSTOM_COLOR_SCHEME_NAME = "Custom"
-set_color_scheme(CUSTOM_COLOR_SCHEME_NAME, COLORS["Spyder"], replace=False)
-
-
-PLUGIN_PATH = None
-from spyderlib.utils import programs
-if programs.is_module_installed("spyderplugins"):
-    import spyderplugins
-    PLUGIN_PATH = osp.abspath(spyderplugins.__path__[0])
-    add_image_path(osp.join(PLUGIN_PATH, 'images'))
-
-def get_spyderplugins(prefix, extension):
-    """Scan spyderplugins module and
-    return the list of module names matching *prefix* and *extension*"""
-    plist = []
-    if PLUGIN_PATH is not None:
-        for name in os.listdir(PLUGIN_PATH):
-            modname, ext = osp.splitext(name)
-            if prefix is not None and not name.startswith(prefix):
-                continue
-            if extension is not None and ext != extension:
-                continue
-            plist.append(modname)
-    return plist
-
-def get_spyderplugins_mods(prefix, extension):
-    """Scan spyderplugins module and
-    return the list of modules matching *prefix* and *extension*"""
-    return [getattr(__import__('spyderplugins.%s' % modname), modname)
-            for modname in get_spyderplugins(prefix, extension)]

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2011-04-29 21:19:10 +0000
+++ MANIFEST.in	2012-03-27 18:05:23 +0000
@@ -2,7 +2,7 @@
 recursive-include spyderlibplugins *.pot *.po *.svg *.png
 recursive-include doc *.py *.rst *.png *.ico *.
 recursive-include app_example *.py *.pyw *.bat *.qm *.svg *.png
-include bin/*
-include spyder
+include scripts/*
 include MANIFEST.in
 include README
+include bootstrap.py

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-06-13 12:17:14 +0000
+++ PKG-INFO	2012-03-27 18:05:23 +0000
@@ -1,19 +1,19 @@
 Metadata-Version: 1.1
 Name: spyder
-Version: 2.0.12
+Version: 2.1.8
 Summary: Scientific PYthon Development EnviRonment
-Home-page: http://spyder.googlecode.com
+Home-page: http://code.google.com/p/spyderlib
 Author: Pierre Raybaut
 Author-email: UNKNOWN
 License: MIT
-Download-URL: http://spyder.googlecode.com/files/spyder-2.0.12.zip
-Description: The spyderlib module provides powerful console and 
-        editor related widgets to your PyQt4 application. It also includes a 
-        Scientific Python development environment named 'Spyder', an alternative to
-        IDLE with powerful interactive features such as variable explorer (with 
-        GUI-based editors for dictionaries, lists, NumPy arrays, etc.), object 
-        inspector, online help, and a lot more.
-Keywords: PyQt4 editor shell console widgets IDE
+Download-URL: http://code.google.com/p/spyderlib/files/spyder-2.1.8.zip
+Description: The spyderlib library provides powerful console and 
+        editor related widgets to your Qt application (PyQt4 or PySide). It also 
+        includes a Scientific Python development environment named 'Spyder', an 
+        alternative to IDLE with powerful interactive features such as variable 
+        explorer (with GUI-based editors for dictionaries, lists, NumPy arrays, etc.), 
+        object inspector, online help, and a lot more.
+Keywords: PyQt4 PySide editor shell console widgets IDE
 Platform: any
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS
@@ -27,7 +27,6 @@
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Widget Sets
-Requires: pyflakes (>0.3.0)
-Requires: rope (>0.9.0)
-Requires: sphinx (>0.6.0)
-Requires: PyQt4 (>4.3)
+Requires: rope (>=0.9.2)
+Requires: sphinx (>=0.6.0)
+Requires: PyQt4 (>=4.4)

=== modified file 'README'
--- README	2011-04-29 21:19:10 +0000
+++ README	2012-03-27 18:05:23 +0000
@@ -1,72 +1,107 @@
-Spyder - Scientific PYthon Development EnviRonment
-==================================================
-
-Copyright © 2009-2010 Pierre Raybaut
-Licensed under the terms of the MIT License
-(see spyderlib/__init__.py for details)
-
-
-    Overview
-
-        Spyder is a Python development environment with tons of features:
-            Editor
-                Multi-language editor with function/class browser, code analysis
-                (pyflakes and pylint are currently supported), horizontal/verti-
-                cal splitting, etc.
-            Documentation viewer
-                Automatically show documentation (if available, or source code
-                otherwise) for any class instantiation or function call made
-                in a Python shell (interactive/external console, see below)
-            Interactive console
-                Python shell with workspace support (variable explorer with GUI
-                based editors: dictionary editor, array editor, ...) and
-                matplotlib figures integration
-            External console (separate process)
-                Run Python scripts (interactive, debugging or normal mode) or
-                open a Python interpreter with variable explorer and documenta-
-                tion viewer support (a basic terminal window may also be opened
-                with the external console)
-            File/directories explorer
-            Find in files feature
-                Supporting regular expressions and mercurial repositories
-            History log
-
-        Spyder may also be used as a PyQt4 extension library (module 'spyderlib').
-        For example, the Python interactive shell widget used in Spyder may be
-        embedded in your own PyQt4 application.
-
-    Building dependencies
-
-        When installing Spyder from the .zip source package (using the 
-        command `python setup.py install`), the requirements are:
-            Python 2.x (x>=5)
-            sphinx >= v0.6 (documentation generation)
-
-    Runtime dependencies
-    
-        Python 2.x (x>=5)
-        PyQt4 4.x (x>=4)
-            
-        Recommended modules
-            pyflakes >v0.3.0 (real-time code analysis)
-            rope >=v0.9.2 (editor code completion, calltips and go-to-definition)
-            sphinx >= v0.6 (object inspector's rich text mode)
-            numpy (N-dimensional arrays)
-            scipy (signal/image processing)
-            matplotlib (2D/3D plotting)
-            IPython (enhanced Python interpreter)
-	    
-        Optional modules
-            pylint (powerful code analysis)
-
-    Installation
-    
-        From the source package (see section 'Building dependencies'):
-            `python setup.py install`
-            
-    More informations
-    
-        Downloads, bug reports and feature requests:
-            http://code.google.com/s/spyder/
-        Discussions:
-            http://groups.google.com/group/spyder
\ No newline at end of file
+Spyder - Scientific PYthon Development EnviRonment
+==================================================
+
+Copyright © 2009-2011 Pierre Raybaut
+Licensed under the terms of the MIT License
+(see spyderlib/__init__.py for details)
+
+
+    Overview
+
+        Spyder is a Python development environment with tons of features:
+            Editor
+                Multi-language editor with function/class browser, code analysis
+                (pyflakes and pylint are currently supported), horizontal/verti-
+                cal splitting, etc.
+            Documentation viewer
+                Automatically show documentation (if available, or source code
+                otherwise) for any class instantiation or function call made
+                in a Python shell (interactive/external console, see below)
+            Interactive console
+                Python shell with workspace support (variable explorer with GUI
+                based editors: dictionary editor, array editor, ...) and
+                matplotlib figures integration
+            External console (separate process)
+                Run Python scripts (interactive, debugging or normal mode) or
+                open a Python interpreter with variable explorer and documenta-
+                tion viewer support (a basic terminal window may also be opened
+                with the external console)
+            File/directories explorer
+            Find in files feature
+                Supporting regular expressions and mercurial repositories
+            History log
+
+        Spyder may also be used as a PyQt4 extension library (module 'spyderlib').
+        For example, the Python interactive shell widget used in Spyder may be
+        embedded in your own PyQt4 application.
+
+    Build dependencies
+
+        When installing Spyder from the .zip source package (using the 
+        command `python setup.py install`), the requirements are:
+            Python 2.5+
+            sphinx 0.6+ (documentation generation)
+
+    Runtime dependencies
+    
+        Python 2.5+
+        PyQt4 4.4+ or PySide 1.0.8+
+            
+        Recommended modules
+            pyflakes v0.5.0+ (real-time code analysis)
+            rope v0.9.2+ (editor code completion, calltips and go-to-definition)
+            sphinx v0.6+ (object inspector's rich text mode)
+            numpy (N-dimensional arrays)
+            scipy (signal/image processing)
+            matplotlib (2D/3D plotting)
+	    
+        Optional modules
+            IPython (enhanced Python interpreter)
+            pylint (powerful code analysis)
+            pep8 (style analysis)
+
+    Running from source
+      
+        It is possible to run Spyder directly from unpacked source folder 
+        using Spyder's bootstrap script:
+            `python bootstrap.py`
+
+        This is especially useful for beta-testing, troubleshooting 
+        and development of Spyder itself.
+
+    Installation
+    
+        This section explains how to install the latest *stable* release of 
+        Spyder. If you prefer testing the development version, please use 
+        the bootstrap script (see previous section).
+        
+        From the source package (see section 'Building dependencies'), you may 
+        install Spyder using the integrated setup.py script based on Python 
+        standard library `distutils` with the following command:
+            `python setup.py install`
+
+        Note that `distutils` does *not* uninstall previous versions of Python 
+        packages: it simply copies files on top of an existing installation. 
+        When using this command, it is thus highly recommended to uninstall 
+        manually any previous version of Spyder by removing the associated 
+        directories ('spyderlib' and 'spyderplugins' in your site-packages 
+        directory).
+
+        From the Python package index, you may simply install Spyder *and* 
+        upgrade an existing installation using `pip`:
+        http://pypi.python.org/pypi
+
+        But the easiest way to install the last stable release of Spyder is:
+            * on Windows:
+                * using an executable installer: http://spyderlib.googlecode.com
+                * or through Python(x,y): http://www.pythonxy.com
+            * on Mac OSX, through MacPorts
+            * on GNU/Linux, through your package manager
+        For more details on supported platforms, please go to http://spyderlib.googlecode.com.
+            
+    More informations
+    
+        Downloads, bug reports and feature requests:
+            http://code.google.com/p/spyderlib/
+        Discussions:
+            http://groups.google.com/group/spyderlib
\ No newline at end of file

=== added file 'app_example/create_exe.py'
--- app_example/create_exe.py	1970-01-01 00:00:00 +0000
+++ app_example/create_exe.py	2012-03-27 18:05:23 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © 2011 Pierre Raybaut
+# Licensed under the terms of the MIT License
+# (see spyderlib/__init__.py for details)
+
+"""Create a stand-alone executable"""
+
+try:
+    from guidata.disthelpers import Distribution
+except ImportError:
+    raise ImportError, "This script requires guidata 1.4+"
+
+import spyderlib
+
+
+def create_executable():
+    """Build executable using ``guidata.disthelpers``"""
+    dist = Distribution()
+    dist.setup(name="Example", version="1.1",
+               description=u"Embedding Spyder Qt shell",
+               script="example.pyw", target_name="example.exe")
+    spyderlib.add_to_distribution(dist)
+    #dist.add_modules('matplotlib')  # Uncomment if you need matplotlib
+    dist.excludes += ['IPython']
+    # Building executable
+    dist.build('cx_Freeze')
+
+
+if __name__ == '__main__':
+    create_executable()

=== removed file 'app_example/run_py2exe.bat'
--- app_example/run_py2exe.bat	2011-03-05 18:03:43 +0000
+++ app_example/run_py2exe.bat	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-python setup.py py2exe
-pause
\ No newline at end of file

=== removed file 'app_example/setup.py'
--- app_example/setup.py	2011-04-11 12:46:23 +0000
+++ app_example/setup.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Buiding instructions:
-# python setup.py py2exe
-
-from distutils.core import setup
-import py2exe # Patching distutils setup
-from guidata.disthelpers import (remove_build_dist, get_default_excludes,
-                         get_default_dll_excludes, create_vs2008_data_files,
-                         add_module_data_files, add_modules)
-
-# Removing old build/dist folders
-remove_build_dist()
-
-# Including/excluding DLLs and Python modules
-EXCLUDES = get_default_excludes()
-INCLUDES = []
-DLL_EXCLUDES = get_default_dll_excludes()
-DATA_FILES = create_vs2008_data_files()
-
-# Distributing application-specific data files
-for _modname in ('spyderlib', 'spyderplugins'):
-    add_module_data_files(_modname, ("", ),
-                          ('.mo', '.svg', '.png', '.css', '.py'),
-                          DATA_FILES, copy_to_root=False)
-
-# Configuring/including Python modules
-add_modules(('PyQt4', ), # add 'matplotlib' after 'PyQt4' if you need it
-            DATA_FILES, INCLUDES, EXCLUDES)
-
-EXCLUDES += ['IPython']
-
-setup(
-      options={
-               "py2exe": {"compressed": 2, "optimize": 2, 'bundle_files': 1,
-                          "includes": INCLUDES, "excludes": EXCLUDES,
-                          "dll_excludes": DLL_EXCLUDES,
-                          "dist_dir": "dist",},
-               },
-      data_files=DATA_FILES,
-      windows=[{
-                "script": "example.pyw",
-                "dest_base": "example",
-                "version": "1.0",
-                "company_name": "Pierre Raybaut",
-                "copyright": u"Copyright © 2009-2010 Pierre Raybaut",
-                "name": u"AppWithSpyder",
-                "description": u"Application using Spyder console",
-                },],
-      zipfile = None,
-      )

=== added file 'bootstrap.py'
--- bootstrap.py	1970-01-01 00:00:00 +0000
+++ bootstrap.py	2012-03-27 18:05:23 +0000
@@ -0,0 +1,93 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the terms of the MIT License
+# (see spyderlib/__init__.py for details)
+
+"""
+Bootstrapping Spyder
+(Executing Spyder from source checkout)
+
+This script is a contribution from techtonik:
+http://code.google.com/p/spyderlib/issues/detail?id=741
+"""
+
+# pylint: disable=C0103
+
+import os
+import subprocess
+import sys
+import optparse
+
+# Parsing command line options
+parser = optparse.OptionParser(
+    usage="python bootstrap.py [options] [-- spyder_options]",
+    epilog="Arguments for Spyder's main script are specified after the "\
+           "-- symbol\n(example: `python bootstrap.py -- --debug --light`). "\
+           "Type `python bootstrap.py -- --help` to read more about Spyder "\
+           "options.\n")
+parser.add_option('--gui', dest="gui", default=None,
+                  help="GUI toolkit: pyqt (for PyQt4) or pyside (for PySide)")
+options, args = parser.parse_args()
+assert options.gui in (None, 'pyqt', 'pyside'), \
+       "Invalid GUI toolkit option '%s'" % options.gui
+# Prepare arguments for Spyder's main script
+sys.argv = [sys.argv[0]] + args
+
+
+print("Executing Spyder from source checkout")
+DEVPATH = os.path.dirname(os.path.abspath(__file__))
+
+# Warn if Spyder is located on non-ASCII path
+# http://code.google.com/p/spyderlib/issues/detail?id=812
+try:
+    os.path.join(DEVPATH, u'test')
+except UnicodeDecodeError:
+    print("STOP: Spyder is located in the path with non-ASCII characters,")
+    print("      which is known to cause problems (see issue #812).")
+    raw_input("Press Enter to continue or Ctrl-C to abort...")
+
+# Retrieving Mercurial revision number
+try:
+    output = subprocess.Popen('hg id -nib "%s"' % DEVPATH, shell=True,
+                              stdout=subprocess.PIPE).communicate()
+    hgid, hgnum, hgbranch = output[0].strip().split()
+    print("Revision %s:%s, Branch: %s" % (hgnum, hgid, hgbranch))
+except Exception as exc:
+    print("Error: Failed to get revision number from Mercurial - %s" % exc)
+
+sys.path.insert(0, DEVPATH)
+print("01. Patched sys.path with %s" % DEVPATH)
+
+# Selecting the GUI toolkit: PySide if installed, otherwise PyQt4
+# (Note: PyQt4 is still the officially supported GUI toolkit for Spyder)
+if options.gui is None:
+    try:
+        import PySide
+        print("02. PySide is detected, selecting (experimental)")
+        os.environ['QT_API'] = 'pyside'
+    except:
+        print("02. No PySide detected, using PyQt4 if available")
+else:
+    print ("02. Skipping GUI toolkit detection")
+    os.environ["QT_API"] = options.gui
+
+# Importing Spyder
+from spyderlib import spyder
+QT_API = spyder.qt._modname
+QT_LIB = {'pyqt': 'PyQt4', 'pyside': 'PySide'}[QT_API]
+if QT_API == 'pyqt':
+    import sip
+    try:
+        QT_LIB += (" (API v%d)" % sip.getapi('QString'))
+    except AttributeError:
+        pass
+print("03. Imported Spyder %s (Qt %s via %s %s)" % \
+    (spyder.__version__, spyder.qt.QtCore.__version__,
+     QT_LIB, spyder.qt.__version__))
+
+# Executing Spyder
+print("0x. Enforcing parent console (Windows only)") 
+sys.argv.append("--showconsole")  # Windows only: show parent console
+print("04. Executing spyder.main()")
+spyder.main()

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-13 12:17:14 +0000
+++ debian/changelog	2012-03-27 18:05:23 +0000
@@ -1,3 +1,69 @@
+spyder (2.1.8-1ubuntu1) oneiric; urgency=low
+
+  * Added icon entry to spyder.desktop (LP: #890243) 
+
+ -- Matthew Goode <a4024921@ce-gl079>  Tue, 27 Mar 2012 19:51:02 +0200
+
+spyder (2.1.8-1) unstable; urgency=low
+
+  * Imported Upstream version 2.1.8
+  * prepare for backport
+
+ -- Picca Frédéric-Emmanuel <[e-mail]>  Mon, 20 Feb 2012 23:02:50 +0100
+
+spyder (2.1.7-1) unstable; urgency=low
+
+  * Imported Upstream version 2.1.7
+
+ -- Picca Frédéric-Emmanuel <[e-mail]>  Mon, 16 Jan 2012 18:03:01 +0100
+
+spyder (2.1.6-1) unstable; urgency=low
+
+  * Imported Upstream version 2.1.6
+
+ -- Picca Frédéric-Emmanuel <[e-mail]>  Sun, 01 Jan 2012 17:53:28 +0100
+
+spyder (2.1.4-1) unstable; urgency=low
+
+  * Imported Upstream version 2.1.4
+
+ -- Picca Frédéric-Emmanuel <[e-mail]>  Wed, 30 Nov 2011 17:59:32 +0100
+
+spyder (2.1.3-1) unstable; urgency=low
+
+  * Imported Upstream version 2.1.3
+  * update the copyright file with the new upstream policy
+
+ -- Picca Frédéric-Emmanuel <[e-mail]>  Mon, 28 Nov 2011 17:39:39 +0100
+
+spyder (2.1.2-1) unstable; urgency=low
+
+  * Import Upstream version 2.1.2
+  * debian/spyder.bug-control
+    - report also python-spyderlib (Closes: #647696)
+
+ -- Picca Frédéric-Emmanuel <[e-mail]>  Thu, 17 Nov 2011 21:11:14 +0100
+
+spyder (2.1.1-1) unstable; urgency=low
+
+  * Import Upstream version 2.1.1 (Closes: #636726)
+  * use the old upstream url http://code.google.com/p/spyder/
+    until the transition is done.
+  * debian/control
+    - fix Breaks and Replace
+    - Depends: python-sphinx (>= 1.0.7+dfsg), pyflakes (>= 0.5.0),
+               pep8, python-rope (>= 0.9.2)
+  * debian/copyright fixed using config-edit
+  * debian/rules
+    - use the new dh_sphinxdoc helper
+  * debian/patches
+    - 0001-fix-documentation-installation.patch (updated)
+           build the sphinx documentation only once.
+  * debian/spyder.desktop (deleted)
+    - use the one provided by the upstream
+
+ -- Picca Frédéric-Emmanuel <[e-mail]>  Mon, 31 Oct 2011 12:43:34 +0200
+
 spyder (2.0.12-1) unstable; urgency=low
 
   * Imported Upstream version 2.0.12

=== modified file 'debian/control'
--- debian/control	2011-06-13 12:17:14 +0000
+++ debian/control	2012-03-27 18:05:23 +0000
@@ -6,13 +6,15 @@
 	   Alexandre Fayolle <[e-mail]>,
 	   Picca Frédéric-Emmanuel <[e-mail]>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8.1.1), python-all (>= 2.6.6-3~)
-Build-Depends-Indep: python-sphinx, xsltproc
+Build-Depends: debhelper (>= 8),
+	       python-all (>= 2.6.6-3~)
+Build-Depends-Indep: python-sphinx,
+		     xsltproc
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.6
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/spyder.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/spyder.git
-Homepage: http://code.google.com/p/spyder/
+Homepage: http://code.google.com/p/spyderlib/
 
 Package: spyder
 Architecture: all
@@ -30,13 +32,25 @@
 Section: python
 Depends: ${misc:Depends},
 	 ${python:Depends},
-	 python-qt4,
-	 libjs-jquery
-Recommends: python-scipy, python-numpy, python-matplotlib, ipython, pyflakes, pylint, python-rope, python-sphinx
+	 ${sphinxdoc:Depends},
+	 python-qt4
+Recommends: ipython,
+	    pep8,
+	    pyflakes (>= 0.5.0),
+	    pylint,
+	    python-matplotlib,
+	    python-rope (>= 0.9.2),
+	    python-numpy,
+	    python-scipy,
+	    python-sphinx (>= 0.6.0)
 Provides: ${python:Provides}
-Breaks: ${python:Breaks}, spyder (<< 2.0.11-1),
-Replaces: spyder (<< 2.0.11-1)
+Breaks: ${python:Breaks}, spyder (<< 2.0.12-1),
+Replaces: spyder (<< 2.0.12-1)
 Description: Python IDE for scientists
- Spyder (previously known as Pydee) is a free open-source Python
- development environment providing MATLAB-like features in a simple
- and light-weighted software.
+ Originally written to design Spyder (the Scientific PYthon
+ Development EnviRonment), the spyderlib Python library provides
+ ready-to-use pure-Python widgets: source code editor with syntax
+ highlighting and code introspection/analysis features, NumPy array
+ editor, dictionary editor, Python console, etc. It's based on the Qt
+ Python binding module PyQt4 (and is compatible with PySide since
+ v2.2).

=== modified file 'debian/copyright'
--- debian/copyright	2011-06-13 12:17:14 +0000
+++ debian/copyright	2012-03-27 18:05:23 +0000
@@ -1,18 +1,207 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: Pierre Raybaut <[e-mail]>
 Upstream-Contact: [e-mail]
-Source: http://code.google.com/p/spyder
+Source: http://code.google.com/p/spyderlib
 
 Files: debian/*
 Copyright: © 2009-2010 Ludovic Aubry <[e-mail]>
-	   © 2010-2011, Picca Frédéric-Emmanuel <[e-mail]>
-Licence: MIT
+           © 2010-2011, Picca Frédéric-Emmanuel <[e-mail]>
+License: Expat
 
 Files: *
 Copyright: © 2009-2011 Pierre Raybaut <[e-mail]>
-Licence: MIT
-
-Licence: MIT
+License: Expat
+
+Files: spyderlib/utils/external/pickleshare.py
+Copyright: © Ville Vainio <[e-mail]>
+License: Expat
+
+Files: spyderlib/utils/module_completion.py
+Copyright: 2005,2008,2009,2010,2011 The IPython Development Team
+           2001-2007, Fernando Perez <[e-mail]>
+           2001, Janko Hauser <[e-mail]>
+           2001, Nathaniel Gray <[e-mail]>
+           2002-2005, Alexander Schmolck
+           2004, W.J. van der Laan <[e-mail]>
+           2001, Python Software Foundation, www.python.org
+           2009, Gael Varoquaux ([e-mail])
+           2005, Jörgen Stenarson <[e-mail]>
+License: BSD-3-clause
+
+Files: spyderlib/utils/sphinxify.py
+Copyright: © 2009 Tim Dumol <[e-mail]>
+           © 2010 Carlos Cordoba <[e-mail]>
+License: BSD-3-clause
+
+Files: spyderplugins/p_profiler.py spyderplugins/widgets/profilergui.py
+Copyright: © 2011 Pierre Raybaut <[e-mail]>
+           © 2011 Santiago Jaramillo <[e-mail]>
+License: Expat
+
+Files: spyderlib/images/options.svg spyderlib/images/sift.svg
+Copyright: © 2011 Pierre Raybaut <[e-mail]>
+License: CC-BY-SA
+
+Files: spyderlib/images/spyder.svg spyderlib/images/spyder_light.svg
+Copyright: © 2011 Pierre Raybaut <[e-mail]>
+License: CC-BY
+
+Files: spyderlib/utils/external/path.py
+Copyright: © 2007 Jason Orendorff <[e-mail]>
+License: public-domain
+
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ Neither the name of the IPython Development Team nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: CC-BY
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+ .
+ 1. Definitions
+ .
+     "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+     "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
+     "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+     "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+     "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+     "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+     "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+     "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+     "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+ .
+     to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+     to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+     to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+     to Distribute and Publicly Perform Adaptations.
+ .
+     For the avoidance of doubt:
+         Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+ .
+ The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+ .
+     You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested.
+     If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+     Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+     This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+     Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+ .
+ 8. Miscellaneous
+ .
+     Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+     Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+     If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+     No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+     This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+     The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
+
+License: CC-BY-SA
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+ .
+ 1. Definitions
+ .
+     "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+     "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+     "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+     "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+     "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+     "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+     "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+     "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+     "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+     "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+     "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+ .
+     to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+     to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+     to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+     to Distribute and Publicly Perform Adaptations.
+ .
+     For the avoidance of doubt:
+         Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+ .
+ The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+ .
+     You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+     You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+     If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+     Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+     This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+     Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+ .
+ 8. Miscellaneous
+ .
+     Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+     Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+     If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+     No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+     This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+     The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
+
+License: Expat
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation
  files (the "Software"), to deal in the Software without
@@ -21,10 +210,10 @@
  copies of the Software, and to permit persons to whom the
  Software is furnished to do so, subject to the following
  conditions:
- 
+ .
  The above copyright notice and this permission notice shall be
  included in all copies or substantial portions of the Software.
- 
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -33,3 +222,16 @@
  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
+
+License: public-domain
+ This was created by unknown people across unknown aeons, and
+ changed and updated by lots of more people. It was sung by
+ medieval bards, and touched by that Shakespeare dude, and
+ possibly even Mary Queen of Scots. Who knows? Nobody knows,
+ not even the Shadow knows! There is no evil lurking in the
+ minds of anyone here.
+ .
+ This work is therefore not copyrighted by anyone, and is as
+ much in the public domain as anything can be. Truly, utterly,
+ totally. Be happy.
+

=== modified file 'debian/patches/0001-fix-documentation-installation.patch'
--- debian/patches/0001-fix-documentation-installation.patch	2011-04-11 12:46:23 +0000
+++ debian/patches/0001-fix-documentation-installation.patch	2012-03-27 18:05:23 +0000
@@ -1,22 +1,38 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <[e-mail]>
-Date: Thu, 3 Mar 2011 22:39:45 +0100
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric-Emmanuel=20PICCA?=
+ <[e-mail]>
+Date: Thu, 3 Nov 2011 15:31:46 +0100
 Subject: fix-documentation-installation
 
 ---
- spyderlib/config.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ setup.py              |    4 ++--
+ spyderlib/__init__.py |    1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/spyderlib/config.py b/spyderlib/config.py
-index 3709e3c..8354978 100644
---- a/spyderlib/config.py
-+++ b/spyderlib/config.py
-@@ -28,7 +28,7 @@ DOC_DEV_PATH = osp.join(DATA_DEV_PATH, 'doc')
- 
- # The two following lines are patched when making the debian package:
- DATA_PATH = DATA_DEV_PATH # @@@DATA_PATH@@@
--DOC_PATH = DOC_DEV_PATH # @@@DOC_PATH@@@
-+DOC_PATH = "/usr/share/doc/spyder/html" # @@@DOC_PATH@@@
- 
- EDITABLE_TYPES = [int, long, float, list, dict, tuple, str, unicode, date]
- try:
+diff --git a/setup.py b/setup.py
+index a74961f..b9892f6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -52,8 +52,8 @@ class MyBuildDoc(setup_command.BuildDoc):
+     def run(self):
+         build = self.get_finalized_command('build')
+         sys.path.insert(0, os.path.abspath(build.build_lib))
+-        dirname = self.distribution.get_command_obj('build').build_purelib
+-        self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
++        #dirname = self.distribution.get_command_obj('build').build_purelib
++        #self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+         try:
+             setup_command.BuildDoc.run(self)
+         except UnicodeDecodeError:
+diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
+index 3e72303..717bf75 100644
+--- a/spyderlib/__init__.py
++++ b/spyderlib/__init__.py
+@@ -35,6 +35,7 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'
+ # Dear (Debian, RPM, ...) package makers, please feel free to customize the
+ # following path to module's data (images) and translations:
+ DATAPATH = LOCALEPATH = DOCPATH = ''
++DOCPATH = '/usr/share/doc/python-spyderlib/html'
+ 
+ def add_to_distribution(dist):
+     """Add package to py2exe/cx_Freeze distribution object
 -- 

=== added file 'debian/python-spyderlib.bug-control'
--- debian/python-spyderlib.bug-control	1970-01-01 00:00:00 +0000
+++ debian/python-spyderlib.bug-control	2012-03-27 18:05:23 +0000
@@ -0,0 +1,1 @@
+Report-with: python-qt4

=== added file 'debian/python-spyderlib.docs'
--- debian/python-spyderlib.docs	1970-01-01 00:00:00 +0000
+++ debian/python-spyderlib.docs	2012-03-27 18:05:23 +0000
@@ -0,0 +1,1 @@
+build/sphinx/html
\ No newline at end of file

=== removed file 'debian/python-spyderlib.links'
--- debian/python-spyderlib.links	2011-06-13 12:17:14 +0000
+++ debian/python-spyderlib.links	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/pyshared/spyderlib/doc/_static/jquery.js
-/usr/share/pyshared/spyderlib/doc /usr/share/doc/python-spyderlib/html

=== added file 'debian/python-spyderlib.preinst'
--- debian/python-spyderlib.preinst	1970-01-01 00:00:00 +0000
+++ debian/python-spyderlib.preinst	2012-03-27 18:05:23 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl 2.1.0-1; then
+    if [ -L /usr/share/doc/python-spyderlib/html ]; then
+        rm -f /usr/share/doc/python-spyderlib/html
+    fi
+fi
+
+#DEBHELPER#
\ No newline at end of file

=== modified file 'debian/rules'
--- debian/rules	2011-04-29 21:19:10 +0000
+++ debian/rules	2012-03-27 18:05:23 +0000
@@ -1,23 +1,24 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP     = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
 
+# for backport on stable without bpo
+WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
+
 debian/spyder.1: debian/manpage.xml
 	$(XP) $(DB2MAN) $<
 
 installman: spyder.1
 	dh installman
 
+override_dh_clean:
+	rm -rf build/sphinx
+	dh_clean
+
 %:
-	dh  $@ --with python2
+	dh  $@ --with python2 $(WITH_SPHINXDOC)

=== added file 'debian/spyder.bug-control'
--- debian/spyder.bug-control	1970-01-01 00:00:00 +0000
+++ debian/spyder.bug-control	2012-03-27 18:05:23 +0000
@@ -0,0 +1,1 @@
+Report-with: python-spyderlib python-qt4

=== removed file 'debian/spyder.desktop'
--- debian/spyder.desktop	2011-06-13 12:17:14 +0000
+++ debian/spyder.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=spyder
-GenericName=spyder
-Comment=Python IDE for scientists
-TryExec=spyder
-Exec=spyder
-Categories=Education;Science;Physics;

=== modified file 'debian/spyder.install'
--- debian/spyder.install	2011-06-13 12:17:14 +0000
+++ debian/spyder.install	2012-03-27 18:05:23 +0000
@@ -1,2 +1,2 @@
 usr/bin
-debian/spyder.desktop /usr/share/applications
+scripts/spyder.desktop /usr/share/applications

=== modified file 'debian/spyder.links'
--- debian/spyder.links	2011-06-13 12:17:14 +0000
+++ debian/spyder.links	2012-03-27 18:05:23 +0000
@@ -1,1 +1,1 @@
-/usr/share/pyshared/spyderlib/doc /usr/share/doc/spyder/html
+/usr/share/doc/python-spyderlib/html /usr/share/doc/spyder/html

=== added file 'debian/todo'
--- debian/todo	1970-01-01 00:00:00 +0000
+++ debian/todo	2012-03-27 18:05:23 +0000
@@ -0,0 +1,9 @@
+upstream:
+ - missing license header in 
+   - spyderlib/scientific_startup.py
+   - spyderlib/utils/external/__init__.py
+   - spyderlib/widgets/externalshell/introspection.py
+   - spyderlib/widgets/ipython.py
+   - spyderplugins/io_hdf5.py
+ - spyderlib/utils/module_completion.py
+   modifié donc il manque ton copyright ?
\ No newline at end of file

=== modified file 'debian/watch'
--- debian/watch	2011-06-13 12:17:14 +0000
+++ debian/watch	2012-03-27 18:05:23 +0000
@@ -1,6 +1,6 @@
 version=3
 opts=\
-downloadurlmangle=s|.*[?]name=(.*?)&.*|http://spyder.googlecode.com/files/$1|,\
+downloadurlmangle=s|.*[?]name=(.*?)&.*|http://spyderlib.googlecode.com/files/$1|,\
 filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \
-http://code.google.com/p/spyder/downloads/detail[?]name=spyder-([0-9.]+).zip&.*
+http://code.google.com/p/spyderlib/downloads/detail[?]name=spyder-([\d\.]+(?:rc|beta)*?\d*?).zip&.*
 

=== modified file 'doc/conf.py'
--- doc/conf.py	2011-04-29 21:19:10 +0000
+++ doc/conf.py	2012-03-27 18:05:23 +0000
@@ -45,9 +45,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = '2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

=== modified file 'doc/debugging.rst'
--- doc/debugging.rst	2011-04-11 12:46:23 +0000
+++ doc/debugging.rst	2012-03-27 18:05:23 +0000
@@ -1,31 +1,31 @@
-Debugging
-=========
-
-Debugging in Spyder is supported thanks to the following Python modules:
-
-    * `pdb`: the Python debugger, which is included in Python standard library
-    
-    * `winpdb`: a graphical frontend to `pdb`, which is an external package 
-      (in the :doc:`editor`, press F7 to run `winpdb` on the currently edited 
-      script)
-    
-Debugging with pdb
-------------------
-
-The Python debugger is partly integrated in Spyder:
-
-    * simple breakpoints and conditonal breakpoints may be defined in the 
-      :doc:`editor`
-      
-    * the current frame (debugging step) is highlighted in the :doc:`editor`
-    
-    * at each breakpoint, globals may be accessed through 
-      the :doc:`variableexplorer`
-
-For a simple, yet quite complete introduction to `pdb`, you may read this:
-http://pythonconquerstheuniverse.wordpress.com/category/the-python-debugger/
-
-
-Related plugins:
-    * :doc:`editor`
-    * :doc:`console`
+Debugging
+=========
+
+Debugging in Spyder is supported thanks to the following Python modules:
+
+    * `pdb`: the Python debugger, which is included in Python standard library
+    
+    * `winpdb`: a graphical frontend to `pdb`, which is an external package 
+      (in the :doc:`editor`, press F7 to run `winpdb` on the currently edited 
+      script)
+    
+Debugging with pdb
+------------------
+
+The Python debugger is partly integrated in Spyder:
+
+    * simple breakpoints and conditonal breakpoints may be defined in the 
+      :doc:`editor`
+      
+    * the current frame (debugging step) is highlighted in the :doc:`editor`
+    
+    * at each breakpoint, globals may be accessed through 
+      the :doc:`variableexplorer`
+
+For a simple, yet quite complete introduction to `pdb`, you may read this:
+http://pythonconquerstheuniverse.wordpress.com/category/python-debugger/
+
+
+Related plugins:
+    * :doc:`editor`
+    * :doc:`console`

=== modified file 'doc/index.rst'
--- doc/index.rst	2011-06-13 12:17:14 +0000
+++ doc/index.rst	2012-03-27 18:05:23 +0000
@@ -16,7 +16,7 @@
 debugging console directly in the layout of your graphical user interface.
 
 Spyder websites:
-    * Downloads, bug reports and feature requests: http://spyder.googlecode.com
+    * Downloads, bug reports and feature requests: http://spyderlib.googlecode.com
     * Discussions: http://groups.google.com/group/spyderlib
             
 

=== modified file 'doc/installation.rst'
--- doc/installation.rst	2011-06-13 12:17:14 +0000
+++ doc/installation.rst	2012-03-27 18:05:23 +0000
@@ -1,34 +1,77 @@
-Installation
-============
-
-Dependencies
-------------
-
-Requirements:
-    * Python 2.x (x>=5)
-    * PyQt4 4.x (x>=4)
-            
-Recommended modules:
-    * pyflakes >v0.3.0 (real-time code analysis)
-    * rope >=v0.9.2 (editor code completion, calltips and go-to-definition)
-    * sphinx >=v0.6 (object inspector's rich text mode)
-    * numpy (N-dimensional arrays)
-    * scipy (signal/image processing)
-    * matplotlib (2D/3D plotting)
-    * IPython (enhanced Python interpreter)
-	
-Optional modules:
-    * pylint (code analysis)
-
-Installation
-------------
-
-From the source package:
-    `python setup.py install`
-        
-Help and support
-----------------
-
-Spyder websites:
-    * Downloads, bug reports and feature requests: http://spyder.googlecode.com
-    * Discussions: http://groups.google.com/group/spyderlib
+Installation
+============
+
+Dependencies
+------------
+
+Requirements:
+    * Python 2.5+ 
+    * PyQt4 4.4+ or PySide 1.0.8+
+
+Recommended modules:
+    * pyflakes v0.5.0+ (real-time code analysis)
+    * rope 0.9.2+ (editor code completion, calltips and go-to-definition)
+    * sphinx 0.6+ (object inspector's rich text mode)
+    * numpy (N-dimensional arrays)
+    * scipy (signal/image processing)
+    * matplotlib (2D/3D plotting)
+
+Optional modules:
+    * IPython (enhanced Python interpreter)
+    * pylint (code analysis)
+    * pep8 (style analysis)
+
+.. note::
+
+    Since v2.0, the `QScintilla` library (source code editor widgets for 
+    `PyQt4`) is no longer needed as Spyder is relying on pure Python/Qt
+    features (provided by `PyQt4` or `PySide`).
+
+
+Running from source
+-------------------
+
+It is possible to run Spyder directly from unpacked source folder 
+using Spyder's bootstrap script:
+    `python bootstrap.py`
+
+This is especially useful for beta-testing, troubleshooting and development 
+of Spyder itself.
+
+
+Installation
+------------
+
+This section explains how to install the latest *stable* release of Spyder.
+If you prefer testing the development version, please use the bootstrap script
+(see previous section).
+
+From the source package (see section 'Building dependencies'), you may 
+install Spyder using the integrated setup.py script based on Python 
+standard library `distutils` with the following command:
+    `python setup.py install`
+
+Note that `distutils` does *not* uninstall previous versions of Python 
+packages: it simply copies files on top of an existing installation. 
+When using this command, it is thus highly recommended to uninstall 
+manually any previous version of Spyder by removing the associated 
+directories ('spyderlib' and 'spyderplugins' in your site-packages 
+directory).
+
+From the Python package index, you may simply install Spyder *and* 
+upgrade an existing installation using `pip`:
+http://pypi.python.org/pypi
+
+But the easiest way to install the last stable release of Spyder is:
+    * on Windows, using an executable installer (http://spyderlib.googlecode.com) or through Python(x,y) (http://www.pythonxy.com)
+    * on Mac OSX, through MacPorts
+    * on GNU/Linux, through your package manager
+For more details on supported platforms, please go to http://spyderlib.googlecode.com.
+
+
+Help and support
+----------------
+
+Spyder websites:
+    * Downloads, bug reports and feature requests: http://spyderlib.googlecode.com
+    * Discussions: http://groups.google.com/group/spyderlib

=== modified file 'doc/options.rst'
--- doc/options.rst	2011-04-29 21:19:10 +0000
+++ doc/options.rst	2012-03-27 18:05:23 +0000
@@ -9,7 +9,8 @@
   -l, --light           Light version (all add-ons are disabled)
   --session=STARTUP_SESSION
                         Startup session
-  --reset               Reset to default session
+  --defaults            Reset to configuration settings to defaults
+  --reset               Remove all configuration files!
   --optimize            Optimize Spyder bytecode (this may require
                         administrative privileges)
   -w WORKING_DIRECTORY, --workdir=WORKING_DIRECTORY
@@ -18,4 +19,4 @@
   --multithread         Internal console is executed in another thread
                         (separate from main application thread)
   --profile             Profile mode (internal test, not related with Python
-                        profiling)
+                        profiling)
\ No newline at end of file

=== modified file 'doc/overview.rst'
--- doc/overview.rst	2011-04-29 21:19:10 +0000
+++ doc/overview.rst	2012-03-27 18:05:23 +0000
@@ -75,6 +75,6 @@
   * :doc:`projectexplorer` (support Pydev project import)
 
 
-Spyder may also be used as a PyQt4 extension library (module 'spyderlib').
-For example, the Python interactive shell widget used in Spyder may be
-embedded in your own PyQt4 application.            
+Spyder may also be used as a PyQt4 or PySide extension library 
+(module 'spyderlib'). For example, the Python interactive shell widget 
+used in Spyder may be embedded in your own PyQt4 or PySide application.

=== added directory 'scripts'
=== added file 'scripts/spyder'
--- scripts/spyder	1970-01-01 00:00:00 +0000
+++ scripts/spyder	2012-03-27 18:05:23 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+from spyderlib import spyder
+spyder.main()

=== added file 'scripts/spyder.bat'
--- scripts/spyder.bat	1970-01-01 00:00:00 +0000
+++ scripts/spyder.bat	2012-03-27 18:05:23 +0000
@@ -0,0 +1,2 @@
+@echo off
+python "%~dpn0" %*
\ No newline at end of file

=== added file 'scripts/spyder.desktop'
--- scripts/spyder.desktop	1970-01-01 00:00:00 +0000
+++ scripts/spyder.desktop	2012-03-27 18:05:23 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Spyder
+GenericName=Spyder
+Comment=Scientific PYthon Development EnviRonment
+TryExec=spyder
+Exec=spyder
+MimeType=application/x-foo;
+Icon=/usr/share/pyshared/spyderlib/images/spyder.svg
+Categories=Development;Science;IDE;Qt;

=== modified file 'setup.py'
--- setup.py	2011-06-13 12:17:14 +0000
+++ setup.py	2012-03-27 18:05:23 +0000
@@ -1,101 +1,106 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2009-2010 Pierre Raybaut
-# Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
-
-"""
-Spyder
-======
-
-The Scientific PYthon Development EnviRonment
-"""
-
-from distutils.core import setup
-from distutils.command.build import build
-from sphinx import setup_command
-import os, os.path as osp, sys
-
-
-def get_package_data(name, extlist):
-    """Return data files for package *name* with extensions in *extlist*"""
-    flist = []
-    # Workaround to replace os.path.relpath (not available until Python 2.6):
-    offset = len(name)+len(os.pathsep)
-    for dirpath, _dirnames, filenames in os.walk(name):
-        for fname in filenames:
-            if not fname.startswith('.') and osp.splitext(fname)[1] in extlist:
-                flist.append(osp.join(dirpath, fname)[offset:])
-    return flist
-
-def get_subpackages(name):
-    """Return subpackages of package *name*"""
-    splist = []
-    for dirpath, _dirnames, _filenames in os.walk(name):
-        if osp.isfile(osp.join(dirpath, '__init__.py')):
-            splist.append(".".join(dirpath.split(os.sep)))
-    return splist
-
-# Sphinx build (documentation)
-class MyBuild(build):
-    def has_doc(self):
-        setup_dir = os.path.dirname(os.path.abspath(__file__))
-        return os.path.isdir(os.path.join(setup_dir, 'doc'))
-    sub_commands = build.sub_commands + [('build_doc', has_doc)]
-
-class MyBuildDoc(setup_command.BuildDoc):
-    def run(self):
-        build = self.get_finalized_command('build')
-        sys.path.insert(0, os.path.abspath(build.build_lib))
-        dirname = self.distribution.get_command_obj('build').build_purelib
-        self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
-        try:
-            setup_command.BuildDoc.run(self)
-        except UnicodeDecodeError:
-            print >>sys.stderr, "ERROR: unable to build documentation because Sphinx do not handle source path with non-ASCII characters. Please try to move the source package to another location (path with *only* ASCII characters)."        
-        sys.path.pop(0)
-
-cmdclass = {'build': MyBuild, 'build_doc': MyBuildDoc}
-
-
-NAME = 'spyder'
-LIBNAME = 'spyderlib'
-from spyderlib import __version__
-GOOGLE_URL = 'http://%s.googlecode.com' % NAME
-
-setup(name=NAME,
-      version=__version__,
-      description='Scientific PYthon Development EnviRonment',
-      long_description="""The spyderlib module provides powerful console and 
-editor related widgets to your PyQt4 application. It also includes a 
-Scientific Python development environment named 'Spyder', an alternative to
-IDLE with powerful interactive features such as variable explorer (with 
-GUI-based editors for dictionaries, lists, NumPy arrays, etc.), object 
-inspector, online help, and a lot more.""",
-      download_url='%s/files/%s-%s.zip' % (GOOGLE_URL, NAME, __version__),
-      author="Pierre Raybaut",
-      url=GOOGLE_URL,
-      license='MIT',
-      keywords='PyQt4 editor shell console widgets IDE',
-      platforms=['any'],
-      packages=get_subpackages(LIBNAME)+get_subpackages('spyderplugins'),
-      package_data={LIBNAME:
-                    get_package_data(LIBNAME, ('.mo', '.svg', '.png', '.css')),
-                    'spyderplugins':
-                    get_package_data('spyderplugins', ('.mo', '.svg', '.png'))},
-      requires=["pyflakes (>0.3.0)", "rope (>0.9.0)", "sphinx (>0.6.0)",
-                "PyQt4 (>4.3)"],
-      scripts=['spyder', 'spyder.bat'] if os.name == 'nt' else ['spyder'],
-      classifiers=['License :: OSI Approved :: MIT License',
-                   'Operating System :: MacOS',
-                   'Operating System :: Microsoft :: Windows',
-                   'Operating System :: OS Independent',
-                   'Operating System :: POSIX',
-                   'Operating System :: Unix',
-                   'Programming Language :: Python :: 2.5',
-                   'Programming Language :: Python :: 2.6',
-                   'Programming Language :: Python :: 2.7',
-                   'Development Status :: 5 - Production/Stable',
-                   'Topic :: Scientific/Engineering',
-                   'Topic :: Software Development :: Widget Sets'],
-      cmdclass=cmdclass)
+# -*- coding: utf-8 -*-
+#
+# Copyright © 2009-2010 Pierre Raybaut
+# Licensed under the terms of the MIT License
+# (see spyderlib/__init__.py for details)
+
+"""
+Spyder
+======
+
+The Scientific PYthon Development EnviRonment
+"""
+
+from distutils.core import setup
+from distutils.command.build import build
+from sphinx import setup_command
+import os
+import os.path as osp
+import sys
+
+
+def get_package_data(name, extlist):
+    """Return data files for package *name* with extensions in *extlist*"""
+    flist = []
+    # Workaround to replace os.path.relpath (not available until Python 2.6):
+    offset = len(name)+len(os.pathsep)
+    for dirpath, _dirnames, filenames in os.walk(name):
+        for fname in filenames:
+            if not fname.startswith('.') and osp.splitext(fname)[1] in extlist:
+                flist.append(osp.join(dirpath, fname)[offset:])
+    return flist
+
+
+def get_subpackages(name):
+    """Return subpackages of package *name*"""
+    splist = []
+    for dirpath, _dirnames, _filenames in os.walk(name):
+        if osp.isfile(osp.join(dirpath, '__init__.py')):
+            splist.append(".".join(dirpath.split(os.sep)))
+    return splist
+
+
+# Sphinx build (documentation)
+class MyBuild(build):
+    def has_doc(self):
+        setup_dir = os.path.dirname(os.path.abspath(__file__))
+        return os.path.isdir(os.path.join(setup_dir, 'doc'))
+    sub_commands = build.sub_commands + [('build_doc', has_doc)]
+
+
+class MyBuildDoc(setup_command.BuildDoc):
+    def run(self):
+        build = self.get_finalized_command('build')
+        sys.path.insert(0, os.path.abspath(build.build_lib))
+        #dirname = self.distribution.get_command_obj('build').build_purelib
+        #self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+        try:
+            setup_command.BuildDoc.run(self)
+        except UnicodeDecodeError:
+            print >>sys.stderr, "ERROR: unable to build documentation because Sphinx do not handle source path with non-ASCII characters. Please try to move the source package to another location (path with *only* ASCII characters)."        
+        sys.path.pop(0)
+
+
+cmdclass = {'build': MyBuild, 'build_doc': MyBuildDoc}
+
+
+NAME = 'spyder'
+LIBNAME = 'spyderlib'
+from spyderlib import __version__, __project_url__
+
+setup(name=NAME,
+      version=__version__,
+      description='Scientific PYthon Development EnviRonment',
+      long_description="""The spyderlib library provides powerful console and 
+editor related widgets to your Qt application (PyQt4 or PySide). It also 
+includes a Scientific Python development environment named 'Spyder', an 
+alternative to IDLE with powerful interactive features such as variable 
+explorer (with GUI-based editors for dictionaries, lists, NumPy arrays, etc.), 
+object inspector, online help, and a lot more.""",
+      download_url='%s/files/%s-%s.zip' % (__project_url__, NAME, __version__),
+      author="Pierre Raybaut",
+      url=__project_url__,
+      license='MIT',
+      keywords='PyQt4 PySide editor shell console widgets IDE',
+      platforms=['any'],
+      packages=get_subpackages(LIBNAME)+get_subpackages('spyderplugins'),
+      package_data={LIBNAME:
+                    get_package_data(LIBNAME, ('.mo', '.svg', '.png', '.css')),
+                    'spyderplugins':
+                    get_package_data('spyderplugins', ('.mo', '.svg', '.png'))},
+      requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"],
+      scripts=[osp.join('scripts', fname) for fname in 
+               (['spyder', 'spyder.bat'] if os.name == 'nt' else ['spyder'])],
+      classifiers=['License :: OSI Approved :: MIT License',
+                   'Operating System :: MacOS',
+                   'Operating System :: Microsoft :: Windows',
+                   'Operating System :: OS Independent',
+                   'Operating System :: POSIX',
+                   'Operating System :: Unix',
+                   'Programming Language :: Python :: 2.5',
+                   'Programming Language :: Python :: 2.6',
+                   'Programming Language :: Python :: 2.7',
+                   'Development Status :: 5 - Production/Stable',
+                   'Topic :: Scientific/Engineering',
+                   'Topic :: Software Development :: Widget Sets'],
+      cmdclass=cmdclass)

=== removed file 'spyder'
--- spyder	2010-03-25 17:30:45 +0000
+++ spyder	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from spyderlib import spyder
-spyder.main()

=== removed file 'spyder.bat'
--- spyder.bat	2011-04-29 21:19:10 +0000
+++ spyder.bat	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-@echo off
-python "%~dpn0" %*
\ No newline at end of file

=== modified file 'spyderlib/__init__.py'
--- spyderlib/__init__.py	2011-06-13 12:17:14 +0000
+++ spyderlib/__init__.py	2012-03-27 18:05:23 +0000
@@ -3,7 +3,7 @@
 Spyder License Agreement (MIT License)
 --------------------------------------
 
-Copyright (c) 2009-2010 Pierre Raybaut
+Copyright (c) 2009-2011 Pierre Raybaut
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -27,7 +27,23 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '2.0.12'
+__version__ = '2.1.8'
 __license__ = __doc__
-
-#FIXME: Internal console MT: for i in range(100000): print i -> bug
+__project_url__ = 'http://code.google.com/p/spyderlib'
+__forum_url__   = 'http://groups.google.com/group/spyderlib'
+
+# Dear (Debian, RPM, ...) package makers, please feel free to customize the
+# following path to module's data (images) and translations:
+DATAPATH = LOCALEPATH = DOCPATH = ''
+DOCPATH = '/usr/share/doc/python-spyderlib/html'
+
+def add_to_distribution(dist):
+    """Add package to py2exe/cx_Freeze distribution object
+    Extension to guidata.disthelpers"""
+    dist.add_modules('PyQt4')
+    for _modname in ('spyderlib', 'spyderplugins'):
+        dist.add_module_data_files(_modname, ("", ),
+                                   ('.png', '.svg', '.html', '.png', '.txt',
+                                    '.js', '.inv', '.ico', '.css', '.doctree',
+                                    '.qm', '.py',),
+                                   copy_to_root=False)

=== added file 'spyderlib/baseconfig.py'
--- spyderlib/baseconfig.py	1970-01-01 00:00:00 +0000
+++ spyderlib/baseconfig.py	2012-03-27 18:05:23 +0000
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © 2011 Pierre Raybaut
+# Licensed under the terms of the MIT License
+# (see spyderlib/__init__.py for details)
+
+"""
+Spyder base configuration management
+
+As opposed to spyderlib/config.py, this configuration script deals 
+exclusively with non-GUI features configuration only
+(in other words, we won't import any PyQt object here, avoiding any 
+sip API incompatibility issue in spyderlib's non-gui modules)
+"""
+
+import os.path as osp
+import os
+import sys
+
+# Local imports
+from spyderlib import __version__
+
+
+#==============================================================================
+# Debug helpers
+#==============================================================================
+STDOUT = sys.stdout
+STDERR = sys.stderr
+DEBUG = bool(os.environ.get('SPYDER_DEBUG', ''))
+
+
+#==============================================================================
+# Configuration paths
+#==============================================================================
+SUBFOLDER = '.spyder%s' % __version__.split('.')[0]
+
+def get_conf_path(filename=None):
+    """Return absolute path for configuration file with specified filename"""
+    from spyderlib import userconfig
+    conf_dir = osp.join(userconfig.get_home_dir(), SUBFOLDER)
+    if not osp.isdir(conf_dir):
+        os.mkdir(conf_dir)
+    if filename is None:
+        return conf_dir
+    else:
+        return osp.join(conf_dir, filename)
+        
+
+def get_module_path(modname):
+    """Return module *modname* base path"""
+    return osp.abspath(osp.dirname(sys.modules[modname].__file__))
+
+
+def get_module_data_path(modname, relpath=None, attr_name='DATAPATH'):
+    """Return module *modname* data path
+    Note: relpath is ignored if module has an attribute named *attr_name*
+    
+    Handles py2exe/cx_Freeze distributions"""
+    datapath = getattr(sys.modules[modname], attr_name, '')
+    if datapath:
+        return datapath
+    else:
+        datapath = get_module_path(modname)
+        parentdir = osp.join(datapath, osp.pardir)
+        if osp.isfile(parentdir):
+            # Parent directory is not a directory but the 'library.zip' file:
+            # this is either a py2exe or a cx_Freeze distribution
+            datapath = osp.abspath(osp.join(osp.join(parentdir, osp.pardir),
+                                            modname))
+        if relpath is not None:
+            datapath = osp.abspath(osp.join(datapath, relpath))
+        return datapath
+
+
+def get_module_source_path(modname, basename=None):
+    """Return module *modname* source path
+    If *basename* is specified, return *modname.basename* path where 
+    *modname* is a package containing the module *basename*
+    
+    *basename* is a filename (not a module name), so it must include the
+    file extension: .py or .pyw
+    
+    Handles py2exe/cx_Freeze distributions"""
+    srcpath = get_module_path(modname)
+    parentdir = osp.join(srcpath, osp.pardir)
+    if osp.isfile(parentdir):
+        # Parent directory is not a directory but the 'library.zip' file:
+        # this is either a py2exe or a cx_Freeze distribution
+        srcpath = osp.abspath(osp.join(osp.join(parentdir, osp.pardir),
+                                       modname))
+    if basename is not None:
+        srcpath = osp.abspath(osp.join(srcpath, basename))
+    return srcpath
+
+
+def is_py2exe_or_cx_Freeze():
+    """Return True if this is a py2exe/cx_Freeze distribution of Spyder"""
+    return osp.isfile(osp.join(get_module_path('spyderlib'), osp.pardir))
+
+
+SCIENTIFIC_STARTUP = get_module_source_path('spyderlib',
+                                            'scientific_startup.py')
+
+
+#==============================================================================
+# Translations
+#==============================================================================
+def get_translation(modname, dirname=None):
+    """Return translation callback for module *modname*"""
+    if dirname is None:
+        dirname = modname
+    locale_path = get_module_data_path(dirname, relpath="locale",
+                                       attr_name='LOCALEPATH')
+    # fixup environment var LANG in case it's unknown
+    if "LANG" not in os.environ:
+        import locale
+        lang = locale.getdefaultlocale()[0]
+        if lang is not None:
+            os.environ["LANG"] = lang
+    import gettext
+    try:
+        _trans = gettext.translation(modname, locale_path, codeset="utf-8")
+        lgettext = _trans.lgettext
+        def translate_gettext(x):
+            if isinstance(x, unicode):
+                x = x.encode("utf-8")
+            return unicode(lgettext(x), "utf-8")
+        return translate_gettext
+    except IOError, _e:  # analysis:ignore
+        #print "Not using translations (%s)" % _e
+        def translate_dumb(x):
+            if not isinstance(x, unicode):
+                return unicode(x, "utf-8")
+            return x
+        return translate_dumb
+
+# Translation callback
+_ = get_translation("spyderlib")
+
+
+#==============================================================================
+# Namespace Browser (Variable Explorer) configuration management
+#==============================================================================
+
+def get_supported_types():
+    """Return a dictionnary containing types lists supported by the 
+    namespace browser:
+    dict(picklable=picklable_types, editable=editables_types)
+         
+    See:
+    get_remote_data function in spyderlib/widgets/externalshell/monitor.py
+    get_internal_shell_filter method in namespacebrowser.py"""
+    from datetime import date
+    editable_types = [int, long, float, list, dict, tuple, str, unicode, date]
+    try:
+        from numpy import ndarray, matrix
+        editable_types += [ndarray, matrix]
+    except ImportError:
+        pass
+    picklable_types = editable_types[:]
+    try:
+        from spyderlib.pil_patch import Image
+        editable_types.append(Image.Image)
+    except ImportError:
+        pass
+    return dict(picklable=picklable_types, editable=editable_types)
+
+# Variable explorer display / check all elements data types for sequences:
+# (when saving the variable explorer contents, check_all is True,
+#  see widgets/externalshell/namespacebrowser.py:NamespaceBrowser.save_data)
+CHECK_ALL = False #XXX: If True, this should take too much to compute...
+
+EXCLUDED_NAMES = ['nan', 'inf', 'infty', 'little_endian', 'colorbar_doc',
+                  'typecodes', '__builtins__', '__main__', '__doc__', 'NaN',
+                  'Inf', 'Infinity', 'sctypes']
\ No newline at end of file

=== modified file 'spyderlib/config.py'
--- spyderlib/config.py	2011-04-29 21:19:10 +0000
+++ spyderlib/config.py	2012-03-27 18:05:23 +0000
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © 2009-2011 Pierre Raybaut
 # Licensed under the terms of the MIT License
 # (see spyderlib/__init__.py for details)
 
 """
-Spyder configuration management
+Spyder GUI-related configuration management
+(for non-GUI configuration, see spyderlib/baseconfig.py)
 
 Important note regarding shortcuts:
     For compatibility with QWERTZ keyboards, one must avoid using the following
@@ -13,66 +14,97 @@
         Ctrl + Alt + Q, W, F, G, Y, X, C, V, B, N
 """
 
-import os, sys, os.path as osp
-from datetime import date
-from PyQt4.QtGui import QLabel, QIcon, QPixmap, QFont, QFontDatabase
+import os
+import sys
+import os.path as osp
+
+from spyderlib.qt.QtGui import QLabel, QIcon, QPixmap, QFont, QFontDatabase
 
 # Local import
-from userconfig import UserConfig, get_home_dir, NoDefault
-
-DATA_DEV_PATH = osp.dirname(__file__)
-if not osp.isdir(DATA_DEV_PATH):
-    # Assuming py2exe distribution
-    DATA_DEV_PATH = osp.join(sys.prefix, "spyderlib")
-DOC_DEV_PATH = osp.join(DATA_DEV_PATH, 'doc')
-
-# The two following lines are patched when making the debian package:
-DATA_PATH = DATA_DEV_PATH # @@@DATA_PATH@@@
-DOC_PATH = "/usr/share/doc/spyder/html" # @@@DOC_PATH@@@
-
-EDITABLE_TYPES = [int, long, float, list, dict, tuple, str, unicode, date]
-try:
-    from numpy import ndarray, matrix
-    EDITABLE_TYPES += [ndarray, matrix]
-except ImportError:
-    pass
-PICKLABLE_TYPES = EDITABLE_TYPES[:]
-try:
-    from PIL.Image import Image
-    EDITABLE_TYPES.append(Image)
-except ImportError:
-    pass
-
-# Max number of filter iterations for worskpace display:
-# (for workspace saving, itermax == -1, see Workspace.save)
-ITERMAX = -1 #XXX: To be adjusted if it takes too much to compute... 2, 3?
-
-EXCLUDED = ['nan', 'inf', 'infty', 'little_endian', 'colorbar_doc', 'typecodes',
-            '__builtins__', '__main__', '__doc__']
-
-def type2str(types):
-    """Convert types to strings"""
-    return [typ.__name__ for typ in types]
-
-def str2type(strings):
-    """Convert strings to types"""
-    return tuple( [eval(string) for string in strings] )
+from spyderlib.userconfig import UserConfig, get_home_dir, NoDefault
+from spyderlib.baseconfig import (SUBFOLDER, CHECK_ALL, EXCLUDED_NAMES,
+                                  get_module_data_path, _)
+from spyderlib.utils import iofuncs, codeanalysis
+
 
 SANS_SERIF = ['Sans Serif', 'DejaVu Sans', 'Bitstream Vera Sans',
-              'Bitstream Charter', 'Lucida Grande', 'Verdana', 'Geneva',
-              'Lucid', 'Arial', 'Helvetica', 'Avant Garde', 'sans-serif']
-SANS_SERIF.insert(0, unicode(QFont().family()))
+              'Bitstream Charter', 'Times', 'Lucida Grande', 'Calibri',
+              'MS Shell Dlg 2', 'Verdana', 'Geneva', 'Lucid', 'Arial',
+              'Helvetica', 'Avant Garde', 'sans-serif']
 
-MONOSPACE = ['Monospace', 'DejaVu Sans Mono', 'Consolas', 'Courier New',
+MONOSPACE = ['Monospace', 'DejaVu Sans Mono', 'Consolas', 'Monaco',
              'Bitstream Vera Sans Mono', 'Andale Mono', 'Liberation Mono',
-             'Monaco', 'Courier', 'monospace', 'Fixed', 'Terminal']
-MEDIUM = 10
-SMALL = 9
+             'Courier New', 'Courier', 'monospace', 'Fixed', 'Terminal']
+
+if sys.platform == 'darwin':
+    BIG = MEDIUM = SMALL = 12
+elif os.name == 'nt':
+    BIG = 12    
+    MEDIUM = 10
+    SMALL = 9
+else:
+    BIG = 12    
+    MEDIUM = 9
+    SMALL = 9
+
+# Extensions supported by Spyder's Editor
+EDIT_FILETYPES = (
+    (_("Python files"), ('.py', '.pyw', '.ipy')),
+    (_("Cython/Pyrex files"), ('.pyx', '.pxd', '.pxi')),
+    (_("C files"), ('.c', '.h')),
+    (_("C++ files"), ('.cc', '.cpp', '.cxx', '.h', '.hh', '.hpp', '.hxx')),
+    (_("OpenCL files"), ('.cl', )),
+    (_("Fortran files"), ('.f', '.for', '.f90', '.f95', '.f2k')),
+    (_("Patch and diff files"), ('.patch', '.diff', '.rej')),
+    (_("Batch files"), ('.bat', '.cmd')),
+    (_("Text files"), ('.txt',)),
+    (_("reStructured Text files"), ('.txt', '.rst')),
+    (_("gettext files"), ('.po', '.pot')),
+    (_("Web page files"), ('.css', '.htm', '.html',)),
+    (_("Configuration files"), ('.properties', '.session', '.ini', '.inf',
+                                '.reg', '.cfg', '.desktop')),
+                 )
+
+def _get_filters(filetypes):
+    filters = []
+    for title, ftypes in filetypes:
+        filters.append("%s (*%s)" % (title, " *".join(ftypes)))
+    filters.append("%s (*)" % _("All files"))
+    return "\n".join(filters)
+
+def _get_extensions(filetypes):
+    ftype_list = []
+    for _title, ftypes in filetypes:
+        ftype_list += list(ftypes)
+    return ftype_list
+
+EDIT_FILTERS = _get_filters(EDIT_FILETYPES)
+EDIT_EXT = _get_extensions(EDIT_FILETYPES)+['']
+
+# Extensions supported by Spyder's Variable explorer
+IMPORT_EXT = iofuncs.iofunctions.load_extensions.values()
+
+# Extensions that should be visible in Spyder's file/project explorers
+SHOW_EXT = ['.png', '.ico', '.svg']
+
+# Extensions supported by Spyder (Editor or Variable explorer)
+VALID_EXT = EDIT_EXT+IMPORT_EXT
+
+# Find in files include/exclude patterns
+INCLUDE_PATTERNS = [r'|'.join(['\\'+_ext+r'$' for _ext in EDIT_EXT if _ext])+\
+                    r'|README|INSTALL',
+                    r'\.pyw?$|\.ipy$|\.txt$|\.rst$',
+                    '.']
+EXCLUDE_PATTERNS = [r'\.pyc$|\.pyo$|\.orig$|\.hg|\.svn|build',
+                    r'\.pyc$|\.pyo$|\.orig$|\.hg|\.svn']
+
+# Name filters for file/project explorers (excluding files without extension)
+NAME_FILTERS = ['*' + _ext for _ext in VALID_EXT + SHOW_EXT if _ext]+\
+               ['README', 'INSTALL', 'LICENSE', 'CHANGELOG']
 
 DEFAULTS = [
             ('main',
              {
-              'translation': True,
               'vertical_dockwidget_titlebars': False,
               'vertical_tabs': False,
               'animated_docks': True,
@@ -85,6 +117,10 @@
               'lightwindow/is_maximized': False,
               'lightwindow/is_fullscreen': False,
               }),
+            ('quick_layouts',
+             {
+              'place_holder': '',
+              }),
             ('editor_appearance',
              {
               'cursor/width': 2,
@@ -151,33 +187,38 @@
               'show_elapsed_time': True,
               'show_icontext': False,
               'monitor/enabled': True,
-              'mpl_patch/enabled': True,
-              'mpl_patch/backend': 'Qt4Agg',
+              'qt/install_inputhook': os.name == 'nt' \
+                                      or os.environ.get('QT_API') == 'pyside',
+              'qt/api': 'default',
+              'pyqt/api_version': 0,
+              'pyqt/ignore_sip_setapi_errors': False,
+              'matplotlib/patch': True,
+              'matplotlib/backend/enabled': True,
+              'matplotlib/backend/value': 'Qt4Agg',
               'umd/enabled': True,
               'umd/verbose': True,
               'umd/namelist': ['guidata', 'guiqwt'],
               'light_background': True,
               'ipython_set_color': True,
-              'remove_pyqt_inputhook': os.name == 'nt',
-              'ignore_sip_setapi_errors': True,
+              'merge_output_channels': os.name != 'nt',
+              'colorize_sys_stderr': os.name != 'nt',
               }),
             ('variable_explorer',
              {
               'shortcut': "Ctrl+Shift+V",
               'autorefresh': True,
               'autorefresh/timeout': 2000,
-              'editable_types': type2str(EDITABLE_TYPES),
-              'picklable_types': type2str(PICKLABLE_TYPES),
-              'itermax': ITERMAX,
-              'excluded_names': EXCLUDED,
+              'check_all': CHECK_ALL,
+              'excluded_names': EXCLUDED_NAMES,
               'exclude_private': True,
-              'exclude_upper': True,
+              'exclude_uppercase': True,
+              'exclude_capitalized': False,
               'exclude_unsupported': True,
               'inplace': False,
               'truncate': True,
               'minmax': False,
               'collvalue': False,
-              'remote_editing': True,
+              'remote_editing': False,
               }),
             ('editor',
              {
@@ -192,19 +233,22 @@
               'font/bold': False,
               'wrap': False,
               'wrapflag': True,
-              'code_analysis': True,
+              'code_analysis/pyflakes': True,
+              'code_analysis/pep8': False,
               'todo_list': True,
               'realtime_analysis': True,
               'realtime_analysis/timeout': 2500,
               'outline_explorer': True,
               'line_numbers': True,
               'edge_line': True,
-              'edge_line_column': 80,
+              'edge_line_column': 79,
               'toolbox_panel': True,
               'calltips': True,
               'go_to_definition': True,
               'close_parentheses': True,
               'auto_unindent': True,
+              'indent_chars': '*    *',
+              'tab_stop_width': 40,
               'object_inspector': True,
               'codecompletion/auto': True,
               'codecompletion/enter_key': True,
@@ -215,6 +259,8 @@
               'intelligent_backspace': True,
               'highlight_current_line': True,
               'occurence_highlighting': True,
+              'occurence_highlighting/timeout': 1500,
+              'always_remove_trailing_spaces': False,
               'fullpath_sorting': True,
               'show_tab_bar': True,
               'max_recent_files': 20,
@@ -229,6 +275,7 @@
               'font/italic': False,
               'font/bold': False,
               'wrap': True,
+              'go_to_eof': True,
               }),
             ('inspector',
              {
@@ -240,7 +287,7 @@
               'font/italic': False,
               'font/bold': False,
               'rich_text/font/family': SANS_SERIF,
-              'rich_text/font/size': 11,
+              'rich_text/font/size': BIG,
               'rich_text/font/italic': False,
               'rich_text/font/bold': False,
               'wrap': True,
@@ -253,10 +300,17 @@
               'zoom_factor': .8,
               'max_history_entries': 20,
               }),
+            ('outline_explorer',
+             {
+              'shortcut': "Ctrl+Shift+O",
+              'enable': True,
+              }),
             ('project_explorer',
              {
               'shortcut': "Ctrl+Shift+P",
               'enable': True,
+              'name_filters': NAME_FILTERS,
+              'show_all': False,
               }),
             ('arrayeditor',
              {
@@ -283,11 +337,7 @@
              {
               'enable': True,
               'wrap': True,
-              'name_filters': ['*.py', '*.pyw', '*.ipy', '*.pth',
-                               '*.npy', '*.mat', '*.spydata',
-                               '*.txt', '*.csv', '*.dat'],
-              'valid_filetypes': ['', '.py', '.pyw', '.ipy', '.spydata', '.npy',
-                                  '.pth', '.txt', '.csv', '.mat', '.h5'],
+              'name_filters': NAME_FILTERS,
               'show_hidden': True,
               'show_all': False,
               'show_toolbar': True,
@@ -297,13 +347,13 @@
              {
               'enable': True,
               'supported_encodings': ["utf-8", "iso-8859-1", "cp1252"],
-              'include': [r'\.pyw?$|\.ipy$|\.txt$|\.c$|\.cpp$|\.h$|\.hpp$|\.f$|\.ini$', '.'],
+              'include': INCLUDE_PATTERNS,
               'include_regexp': True,
-              'exclude': [r'\.pyc$|\.pyo$|\.orig$|\.hg|\.svn'],
+              'exclude': EXCLUDE_PATTERNS,
               'exclude_regexp': True,
               'search_text_regexp': True,
               'search_text': [''],
-              'search_text_samples': [r'# ?TODO|# ?FIXME|# ?XXX|# ?HINT|# ?TIP'],
+              'search_text_samples': [codeanalysis.TASKS_PATTERN],
               'in_python_path': False,
               'more_options': True,
               }),
@@ -311,34 +361,14 @@
 
 DEV = not __file__.startswith(sys.prefix)
 DEV = False
-from spyderlib import __version__
-_subfolder = '.spyder%s' % __version__.split('.')[0]
-CONF = UserConfig('spyder', defaults=DEFAULTS, load=(not DEV), version='2.0.6',
-                  subfolder=_subfolder, backup=True, raw_mode=True)
+CONF = UserConfig('spyder', defaults=DEFAULTS, load=(not DEV), version='2.4.0',
+                  subfolder=SUBFOLDER, backup=True, raw_mode=True)
 # Removing old .spyder.ini location:
 old_location = osp.join(get_home_dir(), '.spyder.ini')
 if osp.isfile(old_location):
     os.remove(old_location)
 
 
-# Translation support
-if CONF.get('main', 'translation'):
-    from spyderlib.utils.translations import get_translation
-    _ = get_translation("spyderlib")
-else:
-    _ = lambda x: x
-
-
-def get_conf_path(filename=None):
-    """Return absolute path for configuration file with specified filename"""
-    conf_dir = osp.join(get_home_dir(), _subfolder)
-    if not osp.isdir(conf_dir):
-        os.mkdir(conf_dir)
-    if filename is None:
-        return conf_dir
-    else:
-        return osp.join(conf_dir, filename)
-
 IMG_PATH = []
 def add_image_path(path):
     if not osp.isdir(path):
@@ -349,9 +379,14 @@
         for dir in dirs:
             IMG_PATH.append(osp.join(path, dir))
 
-add_image_path(osp.join(DATA_PATH, 'images'))
-
-def get_image_path( name, default="not_found.png" ):
+add_image_path(get_module_data_path('spyderlib', relpath='images'))
+
+from spyderlib.otherplugins import PLUGIN_PATH
+if PLUGIN_PATH is not None:
+    add_image_path(osp.join(PLUGIN_PATH, 'images'))
+
+
+def get_image_path(name, default="not_found.png"):
     """Return image absolute path"""
     for img_path in IMG_PATH:
         full_path = osp.join(img_path, name)
@@ -476,31 +511,3 @@
     set_default_color_scheme(_name, replace=False)
 CUSTOM_COLOR_SCHEME_NAME = "Custom"
 set_color_scheme(CUSTOM_COLOR_SCHEME_NAME, COLORS["Spyder"], replace=False)
-
-
-PLUGIN_PATH = None
-from spyderlib.utils import programs
-if programs.is_module_installed("spyderplugins"):
-    import spyderplugins
-    PLUGIN_PATH = osp.abspath(spyderplugins.__path__[0])
-    add_image_path(osp.join(PLUGIN_PATH, 'images'))
-
-def get_spyderplugins(prefix, extension):
-    """Scan spyderplugins module and
-    return the list of module names matching *prefix* and *extension*"""
-    plist = []
-    if PLUGIN_PATH is not None:
-        for name in os.listdir(PLUGIN_PATH):
-            modname, ext = osp.splitext(name)
-            if prefix is not None and not name.startswith(prefix):
-                continue
-            if extension is not None and ext != extension:
-                continue
-            plist.append(modname)
-    return plist
-
-def get_spyderplugins_mods(prefix, extension):
-    """Scan spyderplugins module and
-    return the list of modules matching *prefix* and *extension*"""
-    return [getattr(__import__('spyderplugins.%s' % modname), modname)
-            for modname in get_spyderplugins(prefix, extension)]

=== added file 'spyderlib/images/actions/hist.png'
Binary files spyderlib/images/actions/hist.png	1970-01-01 00:00:00 +0000 and spyderlib/images/actions/hist.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/editor/highlight.png'
Binary files spyderlib/images/editor/highlight.png	1970-01-01 00:00:00 +0000 and spyderlib/images/editor/highlight.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/filetypes/cc.png'
Binary files spyderlib/images/filetypes/cc.png	1970-01-01 00:00:00 +0000 and spyderlib/images/filetypes/cc.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/filetypes/cl.png'
Binary files spyderlib/images/filetypes/cl.png	1970-01-01 00:00:00 +0000 and spyderlib/images/filetypes/cl.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/filetypes/css.png'
Binary files spyderlib/images/filetypes/css.png	1970-01-01 00:00:00 +0000 and spyderlib/images/filetypes/css.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/filetypes/cxx.png'
Binary files spyderlib/images/filetypes/cxx.png	1970-01-01 00:00:00 +0000 and spyderlib/images/filetypes/cxx.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/filetypes/hh.png'
Binary files spyderlib/images/filetypes/hh.png	1970-01-01 00:00:00 +0000 and spyderlib/images/filetypes/hh.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/filetypes/hpp.png'
Binary files spyderlib/images/filetypes/hpp.png	1970-01-01 00:00:00 +0000 and spyderlib/images/filetypes/hpp.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/filetypes/hxx.png'
Binary files spyderlib/images/filetypes/hxx.png	1970-01-01 00:00:00 +0000 and spyderlib/images/filetypes/hxx.png	2012-03-27 18:05:23 +0000 differ
=== modified file 'spyderlib/images/options.svg'
--- spyderlib/images/options.svg	2010-03-25 17:30:45 +0000
+++ spyderlib/images/options.svg	2012-03-27 18:05:23 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -13,7 +14,7 @@
    height="120"
    id="svg3279"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.2 r9819"
    version="1.0"
    inkscape:export-filename="D:\options.png"
    inkscape:export-xdpi="24"
@@ -60,7 +61,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2.8"
-     inkscape:cx="27.69923"
+     inkscape:cx="-71.05077"
      inkscape:cy="76.846835"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -68,7 +69,8 @@
      inkscape:window-width="1280"
      inkscape:window-height="744"
      inkscape:window-x="-4"
-     inkscape:window-y="-4" />
+     inkscape:window-y="-4"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata3284">
     <rdf:RDF>
@@ -77,7 +79,25 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g

=== added file 'spyderlib/images/projects/folder.png'
Binary files spyderlib/images/projects/folder.png	1970-01-01 00:00:00 +0000 and spyderlib/images/projects/folder.png	2012-03-27 18:05:23 +0000 differ
=== removed file 'spyderlib/images/projects/folder_collapsed.png'
Binary files spyderlib/images/projects/folder_collapsed.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/folder_collapsed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'spyderlib/images/projects/folder_expanded.png'
Binary files spyderlib/images/projects/folder_expanded.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/folder_expanded.png	1970-01-01 00:00:00 +0000 differ
=== added file 'spyderlib/images/projects/package.png'
Binary files spyderlib/images/projects/package.png	1970-01-01 00:00:00 +0000 and spyderlib/images/projects/package.png	2012-03-27 18:05:23 +0000 differ
=== removed file 'spyderlib/images/projects/package_collapsed.png'
Binary files spyderlib/images/projects/package_collapsed.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/package_collapsed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'spyderlib/images/projects/package_expanded.png'
Binary files spyderlib/images/projects/package_expanded.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/package_expanded.png	1970-01-01 00:00:00 +0000 differ
=== added file 'spyderlib/images/projects/pp_folder.png'
Binary files spyderlib/images/projects/pp_folder.png	1970-01-01 00:00:00 +0000 and spyderlib/images/projects/pp_folder.png	2012-03-27 18:05:23 +0000 differ
=== removed file 'spyderlib/images/projects/pp_folder_collapsed.png'
Binary files spyderlib/images/projects/pp_folder_collapsed.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/pp_folder_collapsed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'spyderlib/images/projects/pp_folder_expanded.png'
Binary files spyderlib/images/projects/pp_folder_expanded.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/pp_folder_expanded.png	1970-01-01 00:00:00 +0000 differ
=== added file 'spyderlib/images/projects/pp_package.png'
Binary files spyderlib/images/projects/pp_package.png	1970-01-01 00:00:00 +0000 and spyderlib/images/projects/pp_package.png	2012-03-27 18:05:23 +0000 differ
=== removed file 'spyderlib/images/projects/pp_package_collapsed.png'
Binary files spyderlib/images/projects/pp_package_collapsed.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/pp_package_collapsed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'spyderlib/images/projects/pp_package_expanded.png'
Binary files spyderlib/images/projects/pp_package_expanded.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/pp_package_expanded.png	1970-01-01 00:00:00 +0000 differ
=== added file 'spyderlib/images/projects/pp_project.png'
Binary files spyderlib/images/projects/pp_project.png	1970-01-01 00:00:00 +0000 and spyderlib/images/projects/pp_project.png	2012-03-27 18:05:23 +0000 differ
=== removed file 'spyderlib/images/projects/pp_project_collapsed.png'
Binary files spyderlib/images/projects/pp_project_collapsed.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/pp_project_collapsed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'spyderlib/images/projects/pp_project_expanded.png'
Binary files spyderlib/images/projects/pp_project_expanded.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/pp_project_expanded.png	1970-01-01 00:00:00 +0000 differ
=== added file 'spyderlib/images/projects/project.png'
Binary files spyderlib/images/projects/project.png	1970-01-01 00:00:00 +0000 and spyderlib/images/projects/project.png	2012-03-27 18:05:23 +0000 differ
=== removed file 'spyderlib/images/projects/project_collapsed.png'
Binary files spyderlib/images/projects/project_collapsed.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/project_collapsed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'spyderlib/images/projects/project_expanded.png'
Binary files spyderlib/images/projects/project_expanded.png	2010-06-28 23:43:02 +0000 and spyderlib/images/projects/project_expanded.png	1970-01-01 00:00:00 +0000 differ
=== added file 'spyderlib/images/scm_browse.png'
Binary files spyderlib/images/scm_browse.png	1970-01-01 00:00:00 +0000 and spyderlib/images/scm_browse.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/scm_commit.png'
Binary files spyderlib/images/scm_commit.png	1970-01-01 00:00:00 +0000 and spyderlib/images/scm_commit.png	2012-03-27 18:05:23 +0000 differ
=== modified file 'spyderlib/images/spyder.svg'
--- spyderlib/images/spyder.svg	2010-03-25 17:30:45 +0000
+++ spyderlib/images/spyder.svg	2012-03-27 18:05:23 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -14,9 +15,8 @@
    height="150.31233"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.2 r9819"
    sodipodi:docname="spyder.svg"
-   sodipodi:docbase="/home/sdeibel"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    inkscape:export-filename="D:\Python\spyder\doc_src\_static\spyder.png"
    inkscape:export-xdpi="77.629997"
@@ -29,7 +29,23 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
@@ -42,12 +58,13 @@
      pagecolor="#ffffff"
      id="base"
      inkscape:zoom="2.0279948"
-     inkscape:cx="-53.646496"
+     inkscape:cx="-160.92069"
      inkscape:cy="56.434504"
      inkscape:window-x="0"
      inkscape:window-y="22"
      inkscape:current-layer="svg2"
-     showgrid="false" />
+     showgrid="false"
+     inkscape:window-maximized="0" />
   <defs
      id="defs4">
     <linearGradient
@@ -361,7 +378,7 @@
        sodipodi:cy="45.035332"
        sodipodi:rx="5.9274387"
        sodipodi:ry="10.808859"
-       d="M 102.50982,45.035332 A 5.9274387,10.808859 0 1 1 90.654943,45.035332 A 5.9274387,10.808859 0 1 1 102.50982,45.035332 z"
+       d="m 102.50982,45.035332 c 0,5.969568 -2.653804,10.808859 -5.927438,10.808859 -3.273634,0 -5.927439,-4.839291 -5.927439,-10.808859 0,-5.969568 2.653805,-10.808859 5.927439,-10.808859 3.273634,0 5.927438,4.839291 5.927438,10.808859 z"
        transform="matrix(0.6055665,0.6055665,-0.6286135,0.6286135,75.900286,-31.30135)" />
   </g>
 </svg>

=== modified file 'spyderlib/images/spyder_light.svg'
--- spyderlib/images/spyder_light.svg	2011-03-05 18:03:43 +0000
+++ spyderlib/images/spyder_light.svg	2012-03-27 18:05:23 +0000
@@ -15,8 +15,8 @@
    height="150.31233"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="spyder-small.svg"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="spyder_light.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    inkscape:export-filename="D:\Python\spyder\img_src\ico24.png"
    inkscape:export-xdpi="14.35"
@@ -30,7 +30,22 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
@@ -43,7 +58,7 @@
      pagecolor="#ffffff"
      id="base"
      inkscape:zoom="2.0279948"
-     inkscape:cx="-92.102604"
+     inkscape:cx="-228.44418"
      inkscape:cy="56.434504"
      inkscape:window-x="0"
      inkscape:window-y="22"

=== added file 'spyderlib/images/upper_lower.png'
Binary files spyderlib/images/upper_lower.png	1970-01-01 00:00:00 +0000 and spyderlib/images/upper_lower.png	2012-03-27 18:05:23 +0000 differ
=== added file 'spyderlib/images/whole_words.png'
Binary files spyderlib/images/whole_words.png	1970-01-01 00:00:00 +0000 and spyderlib/images/whole_words.png	2012-03-27 18:05:23 +0000 differ
=== modified file 'spyderlib/interpreter.py'
--- spyderlib/interpreter.py	2011-04-29 21:19:10 +0000
+++ spyderlib/interpreter.py	2012-03-27 18:05:23 +0000
@@ -6,8 +6,14 @@
 
 """Shell Interpreter"""
 
-import sys, atexit, threading, ctypes
-import os, re, os.path as osp, pydoc
+import sys
+import atexit
+import threading
+import ctypes
+import os
+import re
+import os.path as osp
+import pydoc
 from subprocess import Popen, PIPE
 from code import InteractiveConsole
 
@@ -18,9 +24,6 @@
 # Force Python to search modules in the current directory first:
 sys.path.insert(0, '')
 
-# For debugging purpose
-STDOUT, STDERR = sys.stdout, sys.stderr
-
 
 def guess_filename(filename):
     """Guess filename"""
@@ -220,6 +223,8 @@
             
     def run_line(self):
         line = self.stdin_read.readline()
+        if self.exit_flag:
+            return
         # Remove last character which is always '\n':
         self.run_command(line[:-1])
         

=== added file 'spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo'
Binary files spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo	1970-01-01 00:00:00 +0000 and spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo	2012-03-27 18:05:23 +0000 differ
=== modified file 'spyderlib/locale/fr/LC_MESSAGES/spyderlib.po'
--- spyderlib/locale/fr/LC_MESSAGES/spyderlib.po	2011-04-29 21:19:10 +0000
+++ spyderlib/locale/fr/LC_MESSAGES/spyderlib.po	2012-03-27 18:05:23 +0000
@@ -4,8 +4,8 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.0\n"
-"POT-Creation-Date: 2011-04-26 11:26+Paris, Madrid\n"
+"Project-Id-Version: 2.1\n"
+"POT-Creation-Date: 2012-02-20 15:44+Paris, Madrid\n"
 "PO-Revision-Date: 2011-04-11 21:41+2\n"
 "Last-Translator: Pierre Raybaut\n"
 "Language-Team: Python\n"
@@ -14,357 +14,418 @@
 "Content-Transfer-Encoding: utf-8\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: spyderlib\plugins\configdialog.py:120
+#: spyderlib\config.py:52
+msgid "Python files"
+msgstr "Fichier Python"
+
+#: spyderlib\config.py:53
+msgid "Cython/Pyrex files"
+msgstr "Fichiers Cython/Pyrex"
+
+#: spyderlib\config.py:54
+msgid "C files"
+msgstr "Fichiers C"
+
+#: spyderlib\config.py:55
+msgid "C++ files"
+msgstr "Fichiers C++"
+
+#: spyderlib\config.py:56
+msgid "OpenCL files"
+msgstr "Fichiers OpenCL"
+
+#: spyderlib\config.py:57
+msgid "Fortran files"
+msgstr "Fichiers Fortran"
+
+#: spyderlib\config.py:58
+msgid "Patch and diff files"
+msgstr "Fichiers patch et diff"
+
+#: spyderlib\config.py:59
+msgid "Batch files"
+msgstr "Fichiers Batch"
+
+#: spyderlib\config.py:60 spyderlib\utils\iofuncs.py:337
+msgid "Text files"
+msgstr "Fichiers texte"
+
+#: spyderlib\config.py:61
+msgid "reStructured Text files"
+msgstr "Fichiers reST"
+
+#: spyderlib\config.py:62
+msgid "gettext files"
+msgstr "Fichiers gettext"
+
+#: spyderlib\config.py:63
+msgid "Web page files"
+msgstr "Fichiers web"
+
+#: spyderlib\config.py:64
+msgid "Configuration files"
+msgstr "Configurations"
+
+#: spyderlib\config.py:72 spyderlib\widgets\explorer.py:619
+msgid "All files"
+msgstr "Tous les fichiers"
+
+#: spyderlib\plugins\configdialog.py:130
 msgid "Preferences"
 msgstr "Préférences"
 
-#: spyderlib\plugins\configdialog.py:385
+#: spyderlib\plugins\configdialog.py:401
 msgid "Invalid directory path"
 msgstr "Chemin d'accès de répertoire incorrect"
 
-#: spyderlib\plugins\configdialog.py:388 spyderlib\plugins\configdialog.py:404
-#: spyderlib\plugins\runconfig.py:126 spyderlib\plugins\runconfig.py:175
-#: spyderlib\plugins\workingdirectory.py:293
-#: spyderlib\widgets\externalshell\pythonshell.py:540
-#: spyderlib\widgets\findinfiles.py:518 spyderlib\widgets\pathmanager.py:212
+#: spyderlib\plugins\configdialog.py:404 spyderlib\plugins\configdialog.py:420
+#: spyderlib\plugins\runconfig.py:134 spyderlib\plugins\runconfig.py:185
+#: spyderlib\plugins\workingdirectory.py:294 spyderlib\widgets\explorer.py:535
+#: spyderlib\widgets\externalshell\pythonshell.py:584
+#: spyderlib\widgets\findinfiles.py:513 spyderlib\widgets\pathmanager.py:218
+#: spyderlib\widgets\projectexplorer.py:812
 msgid "Select directory"
 msgstr "Sélectionner un répertoire"
 
-#: spyderlib\plugins\configdialog.py:416
+#: spyderlib\plugins\configdialog.py:432
 msgid "Invalid file path"
 msgstr "Chemin d'accès de fichier incorrect"
 
-#: spyderlib\plugins\configdialog.py:419 spyderlib\plugins\configdialog.py:437
+#: spyderlib\plugins\configdialog.py:435 spyderlib\plugins\configdialog.py:453
 msgid "Select file"
 msgstr "Sélectionner un fichier"
 
-#: spyderlib\plugins\configdialog.py:436
+#: spyderlib\plugins\configdialog.py:452
 msgid "All files (*)"
 msgstr "Tous les fichiers (*)"
 
-#: spyderlib\plugins\configdialog.py:500 spyderlib\widgets\formlayout.py:209
+#: spyderlib\plugins\configdialog.py:516 spyderlib\widgets\formlayout.py:205
 msgid "Bold"
 msgstr "Gras"
 
-#: spyderlib\plugins\configdialog.py:503 spyderlib\widgets\formlayout.py:204
+#: spyderlib\plugins\configdialog.py:519 spyderlib\widgets\formlayout.py:200
 msgid "Italic"
 msgstr "Italique"
 
-#: spyderlib\plugins\configdialog.py:541
+#: spyderlib\plugins\configdialog.py:557
 msgid "Font: "
 msgstr "Police : "
 
-#: spyderlib\plugins\configdialog.py:545
+#: spyderlib\plugins\configdialog.py:561
 msgid "Size: "
 msgstr "Taille : "
 
-#: spyderlib\plugins\configdialog.py:554 spyderlib\plugins\history.py:41
+#: spyderlib\plugins\configdialog.py:570 spyderlib\plugins\history.py:40
 msgid "Font style"
 msgstr "Police d'écriture"
 
-#: spyderlib\plugins\configdialog.py:598
+#: spyderlib\plugins\configdialog.py:614
 msgid "General"
 msgstr "Général"
 
-#: spyderlib\plugins\configdialog.py:604 spyderlib\plugins\editor.py:85
-#: spyderlib\plugins\externalconsole.py:39
+#: spyderlib\plugins\configdialog.py:620 spyderlib\plugins\editor.py:81
+#: spyderlib\plugins\externalconsole.py:45
 msgid "Interface"
 msgstr "Interface"
 
-#: spyderlib\plugins\configdialog.py:606
+#: spyderlib\plugins\configdialog.py:623
+msgid "Qt windows style"
+msgstr "Style de fenêtres Qt"
+
+#: spyderlib\plugins\configdialog.py:627
 msgid "Vertical dockwidget title bars"
 msgstr "Barres de titre orientées verticalement"
 
-#: spyderlib\plugins\configdialog.py:608
+#: spyderlib\plugins\configdialog.py:629
 msgid "Vertical dockwidget tabs"
 msgstr "Onglets distribués verticalement"
 
-#: spyderlib\plugins\configdialog.py:610
+#: spyderlib\plugins\configdialog.py:631
 msgid "Animated toolbars and dockwidgets"
 msgstr "Panneaux et barres d'outils animés"
 
-#: spyderlib\plugins\configdialog.py:612
+#: spyderlib\plugins\configdialog.py:633
 msgid "Custom dockwidget margin:"
 msgstr "Marges personnalisées :"
 
-#: spyderlib\plugins\configdialog.py:642
+#: spyderlib\plugins\configdialog.py:664
 msgid "Syntax coloring"
 msgstr "Coloration syntaxique"
 
-#: spyderlib\plugins\configdialog.py:653
+#: spyderlib\plugins\configdialog.py:675
 msgid "Background:"
 msgstr "Fond :"
 
-#: spyderlib\plugins\configdialog.py:654 spyderlib\widgets\editor.py:58
+#: spyderlib\plugins\configdialog.py:676
+#: spyderlib\widgets\sourcecode\codeeditor.py:245
 msgid "Current line:"
 msgstr "Ligne actuelle :"
 
-#: spyderlib\plugins\configdialog.py:655
+#: spyderlib\plugins\configdialog.py:677
 msgid "Occurence:"
 msgstr "Occurence :"
 
-#: spyderlib\plugins\configdialog.py:656
+#: spyderlib\plugins\configdialog.py:678
 msgid "Link:"
 msgstr "Lien :"
 
-#: spyderlib\plugins\configdialog.py:657
+#: spyderlib\plugins\configdialog.py:679
 msgid "Side areas:"
 msgstr "Zones latérales :"
 
-#: spyderlib\plugins\configdialog.py:658
+#: spyderlib\plugins\configdialog.py:680
 msgid "Matched parentheses:"
 msgstr "Parenthèse fermée :"
 
-#: spyderlib\plugins\configdialog.py:659
+#: spyderlib\plugins\configdialog.py:681
 msgid "Unmatched parentheses:"
 msgstr "Parenthèse non fermée :"
 
-#: spyderlib\plugins\configdialog.py:660
+#: spyderlib\plugins\configdialog.py:682
 msgid "Normal text:"
 msgstr "Texte normal :"
 
-#: spyderlib\plugins\configdialog.py:661
+#: spyderlib\plugins\configdialog.py:683
 msgid "Keyword:"
 msgstr "Mot-clé :"
 
-#: spyderlib\plugins\configdialog.py:662
+#: spyderlib\plugins\configdialog.py:684
 msgid "Builtin:"
 msgstr "Objet intégré :"
 
-#: spyderlib\plugins\configdialog.py:663
+#: spyderlib\plugins\configdialog.py:685
 msgid "Definition:"
 msgstr "Définition :"
 
-#: spyderlib\plugins\configdialog.py:664
+#: spyderlib\plugins\configdialog.py:686
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: spyderlib\plugins\configdialog.py:665
+#: spyderlib\plugins\configdialog.py:687
 msgid "String:"
 msgstr "Chaîne :"
 
-#: spyderlib\plugins\configdialog.py:666
+#: spyderlib\plugins\configdialog.py:688
 msgid "Number:"
 msgstr "Nombre :"
 
-#: spyderlib\plugins\configdialog.py:667
+#: spyderlib\plugins\configdialog.py:689
 msgid "Instance:"
 msgstr "Instance :"
 
-#: spyderlib\plugins\configdialog.py:673
+#: spyderlib\plugins\configdialog.py:695
 msgid "Color scheme"
 msgstr "Paramètres de coloration syntaxique"
 
-#: spyderlib\plugins\configdialog.py:695 spyderlib\plugins\shortcuts.py:324
+#: spyderlib\plugins\configdialog.py:717 spyderlib\plugins\shortcuts.py:343
 msgid "Reset to default values"
 msgstr "Rétablir les valeurs par défaut"
 
-#: spyderlib\plugins\console.py:101
+#: spyderlib\plugins\console.py:104
 msgid "Internal console"
 msgstr "Console interne"
 
-#: spyderlib\plugins\console.py:121 spyderlib\spyder.py:573
+#: spyderlib\plugins\console.py:124 spyderlib\spyder.py:641
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: spyderlib\plugins\console.py:122 spyderlib\spyder.py:574
+#: spyderlib\plugins\console.py:125 spyderlib\spyder.py:642
 msgid "Quit"
 msgstr "Quitter"
 
-#: spyderlib\plugins\console.py:125 spyderlib\plugins\externalconsole.py:681
+#: spyderlib\plugins\console.py:128 spyderlib\plugins\externalconsole.py:899
 msgid "&Run..."
 msgstr "Exécute&r..."
 
-#: spyderlib\plugins\console.py:126 spyderlib\plugins\externalconsole.py:682
+#: spyderlib\plugins\console.py:129 spyderlib\plugins\externalconsole.py:900
 msgid "Run a Python script"
 msgstr "Exécuter un script Python"
 
-#: spyderlib\plugins\console.py:129
+#: spyderlib\plugins\console.py:132
 msgid "Environment variables..."
 msgstr "Variables d'environnement..."
 
-#: spyderlib\plugins\console.py:131
+#: spyderlib\plugins\console.py:134
 msgid "Show and edit environment variables (for current session)"
 msgstr ""
 "Afficher et modifier les variables d'environnement (pour la session en cours)"
 
-#: spyderlib\plugins\console.py:135
+#: spyderlib\plugins\console.py:138
 msgid "Show sys.path contents..."
 msgstr "Afficher le contenu de sys.path..."
 
-#: spyderlib\plugins\console.py:137
+#: spyderlib\plugins\console.py:140
 msgid "Show (read-only) sys.path"
 msgstr "Afficher le contenu de sys.path (lecture seule)"
 
-#: spyderlib\plugins\console.py:140
+#: spyderlib\plugins\console.py:143
 msgid "Buffer..."
 msgstr "Tampon..."
 
-#: spyderlib\plugins\console.py:141 spyderlib\plugins\externalconsole.py:59
-#: spyderlib\plugins\history.py:36
+#: spyderlib\plugins\console.py:144 spyderlib\plugins\externalconsole.py:65
+#: spyderlib\plugins\history.py:33
 msgid "Set maximum line count"
 msgstr "Modifier le nombre maximum de lignes"
 
-#: spyderlib\plugins\console.py:144 spyderlib\plugins\explorer.py:67
-#: spyderlib\plugins\history.py:146 spyderlib\plugins\inspector.py:217
-#: spyderlib\plugins\projectexplorer.py:65
+#: spyderlib\plugins\console.py:147 spyderlib\plugins\explorer.py:59
+#: spyderlib\plugins\history.py:149 spyderlib\plugins\inspector.py:220
+#: spyderlib\plugins\projectexplorer.py:56
 msgid "&Font..."
 msgstr "&Police..."
 
-#: spyderlib\plugins\console.py:145 spyderlib\plugins\history.py:147
+#: spyderlib\plugins\console.py:148 spyderlib\plugins\history.py:150
 msgid "Set shell font style"
 msgstr "Changer la police d'écriture de la console"
 
-#: spyderlib\plugins\console.py:148
+#: spyderlib\plugins\console.py:151
 msgid "External editor path..."
 msgstr "Éditeur externe..."
 
-#: spyderlib\plugins\console.py:149
+#: spyderlib\plugins\console.py:152
 msgid "Set external editor executable path"
 msgstr "Modifier le chemin d'accès de l'éditeur externe"
 
-#: spyderlib\plugins\console.py:152 spyderlib\plugins\editor.py:117
-#: spyderlib\plugins\externalconsole.py:60 spyderlib\plugins\history.py:39
-#: spyderlib\plugins\history.py:149 spyderlib\plugins\inspector.py:89
-#: spyderlib\plugins\inspector.py:220
+#: spyderlib\plugins\console.py:155 spyderlib\plugins\editor.py:118
+#: spyderlib\plugins\externalconsole.py:66 spyderlib\plugins\history.py:36
+#: spyderlib\plugins\history.py:152 spyderlib\plugins\inspector.py:89
+#: spyderlib\plugins\inspector.py:223
 msgid "Wrap lines"
 msgstr "Retour à la ligne automatique"
 
-#: spyderlib\plugins\console.py:155 spyderlib\plugins\editor.py:145
-#: spyderlib\plugins\externalconsole.py:93
+#: spyderlib\plugins\console.py:158 spyderlib\plugins\editor.py:148
+#: spyderlib\plugins\externalconsole.py:121
 msgid "Balloon tips"
 msgstr "Info-bulles"
 
-#: spyderlib\plugins\console.py:159 spyderlib\plugins\editor.py:137
-#: spyderlib\plugins\externalconsole.py:85
+#: spyderlib\plugins\console.py:162 spyderlib\plugins\editor.py:140
+#: spyderlib\plugins\externalconsole.py:113
 msgid "Automatic code completion"
 msgstr "Complétion de code automatique"
 
-#: spyderlib\plugins\console.py:163 spyderlib\plugins\editor.py:143
-#: spyderlib\plugins\externalconsole.py:91
+#: spyderlib\plugins\console.py:166 spyderlib\plugins\editor.py:146
+#: spyderlib\plugins\externalconsole.py:119
 msgid "Enter key selects completion"
 msgstr "Entrée valide la complétion de code"
 
-#: spyderlib\plugins\console.py:168
+#: spyderlib\plugins\console.py:171
 msgid "Internal console settings"
 msgstr "Options de la console interne"
 
-#: spyderlib\plugins\console.py:210 spyderlib\plugins\externalconsole.py:861
+#: spyderlib\plugins\console.py:221 spyderlib\plugins\externalconsole.py:1122
 msgid "Run Python script"
 msgstr "Exécuter un script Python"
 
-#: spyderlib\plugins\console.py:211 spyderlib\plugins\externalconsole.py:862
-#: spyderlib\widgets\explorer.py:498 spyderlib\widgets\projectexplorer.py:1167
+#: spyderlib\plugins\console.py:222 spyderlib\plugins\externalconsole.py:227
+#: spyderlib\plugins\externalconsole.py:1123 spyderlib\widgets\explorer.py:633
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: spyderlib\plugins\console.py:257 spyderlib\plugins\explorer.py:140
-#: spyderlib\plugins\history.py:257 spyderlib\plugins\inspector.py:459
-#: spyderlib\plugins\projectexplorer.py:117
+#: spyderlib\plugins\console.py:266 spyderlib\plugins\explorer.py:110
+#: spyderlib\plugins\history.py:261 spyderlib\plugins\inspector.py:465
+#: spyderlib\plugins\projectexplorer.py:109
 msgid "Select a new font"
 msgstr "Sélectionner une police d'écriture"
 
-#: spyderlib\plugins\console.py:264
+#: spyderlib\plugins\console.py:273
 msgid "Buffer"
 msgstr "Tampon"
 
-#: spyderlib\plugins\console.py:265
+#: spyderlib\plugins\console.py:274
 msgid "Maximum line count"
 msgstr "Nombre maximum de lignes"
 
-#: spyderlib\plugins\console.py:274
+#: spyderlib\plugins\console.py:283
 msgid "External editor"
 msgstr "Éditeur externe"
 
-#: spyderlib\plugins\console.py:275
+#: spyderlib\plugins\console.py:284
 msgid "External editor executable path:"
 msgstr "Chemin d'accès de l'exécutable :"
 
-#: spyderlib\plugins\editor.py:79 spyderlib\plugins\editor.py:467
-#: spyderlib\plugins\editor.py:1412 spyderlib\plugins\inspector.py:244
-#: spyderlib\widgets\editor.py:50 spyderlib\widgets\editor.py:458
+#: spyderlib\plugins\editor.py:75 spyderlib\plugins\editor.py:481
+#: spyderlib\plugins\editor.py:1421 spyderlib\plugins\inspector.py:247
+#: spyderlib\widgets\editor.py:518
+#: spyderlib\widgets\sourcecode\codeeditor.py:235
+#: spyderlib\widgets\sourcecode\codeeditor.py:2273
 msgid "Editor"
 msgstr "Éditeur"
 
-#: spyderlib\plugins\editor.py:82
+#: spyderlib\plugins\editor.py:78
 msgid "Edit template for new modules"
 msgstr "Modifier le modèle (nouveaux modules)"
 
-#: spyderlib\plugins\editor.py:87
+#: spyderlib\plugins\editor.py:83
 msgid "Text and margin font style"
 msgstr "Police d'écriture du texte et de la marge"
 
-#: spyderlib\plugins\editor.py:90
-msgid "Show outline explorer"
-msgstr "Afficher l'explorateur de structure"
-
-#: spyderlib\plugins\editor.py:92
+#: spyderlib\plugins\editor.py:86
 msgid "Sort files according to full path"
 msgstr "Classer les fichiers suivant leur chemin complet"
 
-#: spyderlib\plugins\editor.py:94
+#: spyderlib\plugins\editor.py:88
 msgid "Show tab bar"
 msgstr "Afficher la barre d'onglets"
 
-#: spyderlib\plugins\editor.py:102 spyderlib\plugins\editor.py:165
-#: spyderlib\plugins\externalconsole.py:55
-#: spyderlib\plugins\externalconsole.py:84 spyderlib\plugins\history.py:38
+#: spyderlib\plugins\editor.py:95 spyderlib\plugins\editor.py:169
+#: spyderlib\plugins\externalconsole.py:61
+#: spyderlib\plugins\externalconsole.py:112 spyderlib\plugins\history.py:35
 #: spyderlib\plugins\inspector.py:88
 msgid "Source code"
 msgstr "Code source"
 
-#: spyderlib\plugins\editor.py:103
+#: spyderlib\plugins\editor.py:96
 msgid "Show line numbers"
 msgstr "Afficher les numéros de ligne"
 
-#: spyderlib\plugins\editor.py:104
+#: spyderlib\plugins\editor.py:97
 msgid "Show vertical line after"
 msgstr "Afficher une ligne verticale après"
 
-#: spyderlib\plugins\editor.py:105
+#: spyderlib\plugins\editor.py:98
 msgid "characters"
 msgstr "caractères"
 
-#: spyderlib\plugins\editor.py:113
+#: spyderlib\plugins\editor.py:106
 msgid "Highlight current line"
 msgstr "Surligner la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:115
-msgid "Highlight occurences"
-msgstr "Surligner les occurences"
+#: spyderlib\plugins\editor.py:108
+msgid "Highlight occurences after"
+msgstr "Surligner les occurences après"
 
-#: spyderlib\plugins\editor.py:120 spyderlib\plugins\history.py:45
+#: spyderlib\plugins\editor.py:121 spyderlib\plugins\history.py:44
 #: spyderlib\plugins\inspector.py:97
 msgid "Syntax color scheme: "
 msgstr "Thème de coloration syntaxique : "
 
-#: spyderlib\plugins\editor.py:132 spyderlib\plugins\runconfig.py:225
-#: spyderlib\plugins\runconfig.py:273 spyderlib\widgets\explorer.py:215
-#: spyderlib\widgets\externalshell\baseshell.py:131
+#: spyderlib\plugins\editor.py:133 spyderlib\plugins\runconfig.py:258
+#: spyderlib\plugins\runconfig.py:316 spyderlib\spyder.py:1497
+#: spyderlib\widgets\explorer.py:234
+#: spyderlib\widgets\externalshell\baseshell.py:136
 msgid "Run"
 msgstr "Exécuter"
 
-#: spyderlib\plugins\editor.py:133
+#: spyderlib\plugins\editor.py:134
 msgid "Save all files before running script"
 msgstr "Enregistrer tous les fichiers avant l'exécution d'un script"
 
-#: spyderlib\plugins\editor.py:136 spyderlib\plugins\externalconsole.py:270
+#: spyderlib\plugins\editor.py:137 spyderlib\plugins\externalconsole.py:411
 msgid "Introspection"
 msgstr "Introspection"
 
-#: spyderlib\plugins\editor.py:139 spyderlib\plugins\externalconsole.py:87
+#: spyderlib\plugins\editor.py:142 spyderlib\plugins\externalconsole.py:115
 msgid "Case sensitive code completion"
 msgstr "Complétion de code sensible à la casse"
 
-#: spyderlib\plugins\editor.py:141 spyderlib\plugins\externalconsole.py:89
+#: spyderlib\plugins\editor.py:144 spyderlib\plugins\externalconsole.py:117
 msgid "Show single completion"
 msgstr "Afficher les listes de complétion avec un choix unique"
 
-#: spyderlib\plugins\editor.py:146
+#: spyderlib\plugins\editor.py:149
 msgid "Link to object definition"
 msgstr "Lien vers la définition d'un objet"
 
-#: spyderlib\plugins\editor.py:148
+#: spyderlib\plugins\editor.py:151
 msgid ""
 "If this option is enabled, clicking on an object\n"
 "name (left-click + Ctrl key) will go this object\n"
@@ -374,11 +435,11 @@
 "d'un objet (click gauche + touche Ctrl) ira à la\n"
 "définition de cet objet (si celle-ci est trouvée)."
 
-#: spyderlib\plugins\editor.py:152 spyderlib\plugins\externalconsole.py:95
+#: spyderlib\plugins\editor.py:155 spyderlib\plugins\externalconsole.py:123
 msgid "Automatic notification to object inspector"
 msgstr "Notification automatique à l'inspecteur d'objets"
 
-#: spyderlib\plugins\editor.py:154
+#: spyderlib\plugins\editor.py:157
 msgid ""
 "If this option is enabled, object inspector\n"
 "will automatically show informations on functions\n"
@@ -391,7 +452,7 @@
 "(le mécanisme est déclenché par la saisie d'une\n"
 "parenthèse gauche après un nom valide de fonction)"
 
-#: spyderlib\plugins\editor.py:158
+#: spyderlib\plugins\editor.py:162
 msgid ""
 "<b>Warning:</b><br>The Python module <i>rope</i> is not installed on this "
 "computer: calltips, code completion and go-to-definition features won't be "
@@ -401,19 +462,44 @@
 "sur cet ordinateur : les fonctionnalités telles que la complétion de code ou "
 "le lien vers la définition d'un objet ne sont donc pas accessibles."
 
-#: spyderlib\plugins\editor.py:166
+#: spyderlib\plugins\editor.py:170
 msgid "Automatic parentheses, braces and brackets insertion"
-msgstr "Fermeture automatique des parenthèses, crochets et accolades"
+msgstr ""
+"Insertion automatique des parenthèses, crochets et accolades"
 
-#: spyderlib\plugins\editor.py:169
+#: spyderlib\plugins\editor.py:173
 msgid "Automatic indentation after 'else', 'elif', etc."
 msgstr "Indentation automatique après 'else', 'elif', etc."
 
-#: spyderlib\plugins\editor.py:171
+#: spyderlib\plugins\editor.py:175
+msgid "Indentation characters: "
+msgstr "Caractères d'indentation : "
+
+#: spyderlib\plugins\editor.py:176
+msgid "4 spaces"
+msgstr "4 espaces"
+
+#: spyderlib\plugins\editor.py:177
+msgid "2 spaces"
+msgstr "2 espaces"
+
+#: spyderlib\plugins\editor.py:178
+msgid "tab"
+msgstr "tabulation"
+
+#: spyderlib\plugins\editor.py:179
+msgid "Tab stop width:"
+msgstr "Largeur des tabulations :"
+
+#: spyderlib\plugins\editor.py:179
+msgid "pixels"
+msgstr "pixels"
+
+#: spyderlib\plugins\editor.py:181
 msgid "Tab always indent"
 msgstr "Toujours indenter avec la touche Tab"
 
-#: spyderlib\plugins\editor.py:173
+#: spyderlib\plugins\editor.py:183
 msgid ""
 "If enabled, pressing Tab will always indent,\n"
 "even when the cursor is not at the beginning\n"
@@ -427,44 +513,81 @@
 "option est activée, la complétion de code reste \n"
 "accessible via le raccourci Ctrl+Espace)"
 
-#: spyderlib\plugins\editor.py:178
+#: spyderlib\plugins\editor.py:188
 msgid "Intelligent backspace"
 msgstr "Retour arrière (\"backspace\") intelligent"
 
-#: spyderlib\plugins\editor.py:181
+#: spyderlib\plugins\editor.py:190
+msgid "Automatically remove trailing spaces when saving files"
+msgstr ""
+"Supprimer automatiquement les espaces en fin de ligne lors de "
+"l'enregistrement"
+
+#: spyderlib\plugins\editor.py:194
 msgid "Analysis"
 msgstr "Analyse"
 
-#: spyderlib\plugins\editor.py:182
-msgid "Code analysis (pyflakes)"
-msgstr "Analyse de code (pyflakes)"
-
-#: spyderlib\plugins\editor.py:184
+#: spyderlib\plugins\editor.py:196
+msgid ""
+"<u>Note</u>: add <b>analysis:ignore</b> in a comment to ignore code/style "
+"analysis warnings. For more informations on style guide for Python code, "
+"please refer to the %s page."
+msgstr ""
+"<u>Note</u>: ajouter <b>analysis:ignore</b> dans un commentaire pour ignorer "
+"les résultats de l'analyse de code ou de style. Pour plus d'informations sur "
+"les recommandations officielles de style d'écriture avec le langage Python, "
+"veuillez visiter la page de la %s."
+
+#: spyderlib\plugins\editor.py:205
+#: spyderlib\widgets\sourcecode\codeeditor.py:1526
+msgid "Code analysis"
+msgstr "Analyse de code"
+
+#: spyderlib\plugins\editor.py:207
 msgid ""
 "If enabled, Python source code will be analyzed\n"
 "using pyflakes, lines containing errors or \n"
 "warnings will be highlighted"
 msgstr ""
 "Si cette option est activée, le code source Python sera analysé\n"
-"avec pyflakes et les lignes contenant des erreurs seront indiquées"
-
-#: spyderlib\plugins\editor.py:188
+"avec des outils l'outil d'introspection de code pyflakes\n"
+"et les lignes contenant des erreurs seront indiquées"
+
+#: spyderlib\plugins\editor.py:212
+msgid "Code analysis requires pyflakes %s+"
+msgstr "L'analyse de code requiert pyflakes %s+"
+
+#: spyderlib\plugins\editor.py:214
+msgid "Style analysis"
+msgstr "Analyse de style"
+
+#: spyderlib\plugins\editor.py:216
+msgid ""
+"If enabled, Python source code will be analyzed\n"
+"using pep8, lines that are not following PEP8\n"
+"style guide will be highlighted"
+msgstr ""
+"Si cette option est activée, le style du code source Python sera analysé\n"
+"avec l'outil d'introspection de code pep8 et les lignes ne suivant pas\n"
+"les recommandations officielles seront indiquées"
+
+#: spyderlib\plugins\editor.py:223
 msgid "Tasks (TODO, FIXME, XXX, HINT, TIP)"
 msgstr "Tâches (TODO, FIXME, XXX, HINT, TIP)"
 
-#: spyderlib\plugins\editor.py:194
+#: spyderlib\plugins\editor.py:226
 msgid "Perform analysis when saving file and every"
 msgstr "Analyser lors de l'enregistrement et toutes les"
 
-#: spyderlib\plugins\editor.py:198
+#: spyderlib\plugins\editor.py:230
 msgid "Perform analysis only when saving file"
 msgstr "Analyser uniquement lors de l'enregistrement"
 
-#: spyderlib\plugins\editor.py:237
+#: spyderlib\plugins\editor.py:274
 msgid "End-of-line characters"
 msgstr "Caractères de fin de ligne"
 
-#: spyderlib\plugins\editor.py:238
+#: spyderlib\plugins\editor.py:275
 msgid ""
 "When opening a text file containing mixed end-of-line characters (this may "
 "raise syntax errors in Python interpreter on Windows platforms), Spyder may "
@@ -475,190 +598,137 @@
 "l'interpréteur Python sous Windows), Spyder peut réparer le fichier "
 "automatiquement."
 
-#: spyderlib\plugins\editor.py:244
+#: spyderlib\plugins\editor.py:281
 msgid "Fix automatically and show warning message box"
 msgstr "Réparer automatiquement et afficher un message d'avertissement"
 
-#: spyderlib\plugins\editor.py:255 spyderlib\plugins\externalconsole.py:268
-#: spyderlib\plugins\variableexplorer.py:43
+#: spyderlib\plugins\editor.py:292 spyderlib\plugins\externalconsole.py:409
+#: spyderlib\plugins\variableexplorer.py:40
 msgid "Display"
 msgstr "Affichage"
 
-#: spyderlib\plugins\editor.py:257
+#: spyderlib\plugins\editor.py:294
 msgid "Code Introspection/Analysis"
 msgstr "Introspection et analyse de code"
 
-#: spyderlib\plugins\editor.py:260 spyderlib\plugins\externalconsole.py:272
+#: spyderlib\plugins\editor.py:297 spyderlib\plugins\externalconsole.py:414
 msgid "Advanced settings"
 msgstr "Options avancées"
 
-#: spyderlib\plugins\editor.py:303
-msgid "Python files"
-msgstr "Fichier Python"
-
-#: spyderlib\plugins\editor.py:304
-msgid "Cython/Pyrex files"
-msgstr "Fichiers Cython/Pyrex"
-
-#: spyderlib\plugins\editor.py:305
-msgid "C files"
-msgstr "Fichiers C"
-
-#: spyderlib\plugins\editor.py:306
-msgid "C++ files"
-msgstr "Fichiers C++"
-
-#: spyderlib\plugins\editor.py:308
-msgid "Fortran files"
-msgstr "Fichiers Fortran"
-
-#: spyderlib\plugins\editor.py:310
-msgid "Patch and diff files"
-msgstr "Fichiers patch et diff"
-
-#: spyderlib\plugins\editor.py:312
-msgid "Batch files"
-msgstr "Fichiers Batch"
-
-#: spyderlib\plugins\editor.py:314 spyderlib\utils\iofuncs.py:328
-msgid "Text files"
-msgstr "Fichiers texte"
-
-#: spyderlib\plugins\editor.py:315
-msgid "reStructured Text files"
-msgstr "Fichiers reST"
-
-#: spyderlib\plugins\editor.py:317
-msgid "gettext files"
-msgstr "Fichiers gettext"
-
-#: spyderlib\plugins\editor.py:318
-msgid "Web page files"
-msgstr "Fichiers web"
-
-#: spyderlib\plugins\editor.py:320
-msgid "Configuration files"
-msgstr "Configurations"
-
-#: spyderlib\plugins\editor.py:323 spyderlib\widgets\explorer.py:499
-#: spyderlib\widgets\projectexplorer.py:1127
-msgid "All files"
-msgstr "Tous les fichiers"
-
-#: spyderlib\plugins\editor.py:528 spyderlib\widgets\editortools.py:529
+#: spyderlib\plugins\editor.py:540 spyderlib\widgets\editortools.py:483
 msgid "Show/hide outline explorer"
 msgstr "Afficher/masquer l'explorateur de structure"
 
-#: spyderlib\plugins\editor.py:535
+#: spyderlib\plugins\editor.py:546
 msgid "Show/hide project explorer"
 msgstr "Afficher/masquer l'explorateur de projets"
 
-#: spyderlib\plugins\editor.py:543
+#: spyderlib\plugins\editor.py:554
 msgid "&New file..."
 msgstr "&Nouveau fichier..."
 
-#: spyderlib\plugins\editor.py:544
+#: spyderlib\plugins\editor.py:555
 msgid "Create a new Python script"
 msgstr "Créer un nouveau script Python"
 
-#: spyderlib\plugins\editor.py:548
+#: spyderlib\plugins\editor.py:559
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: spyderlib\plugins\editor.py:549
+#: spyderlib\plugins\editor.py:560
 msgid "Open text file"
 msgstr "Ouvrir un fichier texte"
 
-#: spyderlib\plugins\editor.py:551
+#: spyderlib\plugins\editor.py:562
 msgid "&Revert"
 msgstr "&Réinitialiser"
 
-#: spyderlib\plugins\editor.py:552
+#: spyderlib\plugins\editor.py:563
 msgid "Revert file from disk"
 msgstr "Revenir à la version du fichier enregistrée sur le disque"
 
-#: spyderlib\plugins\editor.py:556
+#: spyderlib\plugins\editor.py:567
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: spyderlib\plugins\editor.py:557
+#: spyderlib\plugins\editor.py:568
 msgid "Save current file"
 msgstr "Enregistrer le fichier en cours d'édition"
 
-#: spyderlib\plugins\editor.py:561
+#: spyderlib\plugins\editor.py:572
 msgid "Sav&e all"
 msgstr "Enregistrer &tout"
 
-#: spyderlib\plugins\editor.py:562
+#: spyderlib\plugins\editor.py:573
 msgid "Save all opened files"
 msgstr "Enregistrer tous les fichiers ouverts"
 
-#: spyderlib\plugins\editor.py:566
+#: spyderlib\plugins\editor.py:577
 msgid "Save &as..."
 msgstr "Enregistrer &sous..."
 
-#: spyderlib\plugins\editor.py:567
+#: spyderlib\plugins\editor.py:578
 msgid "Save current file as..."
 msgstr "Enregistrer le fichier en cours d'édition sous un autre nom..."
 
-#: spyderlib\plugins\editor.py:569 spyderlib\plugins\editor.py:570
+#: spyderlib\plugins\editor.py:580 spyderlib\plugins\editor.py:581
 msgid "Print preview..."
 msgstr "Aperçu avant impression..."
 
-#: spyderlib\plugins\editor.py:571
+#: spyderlib\plugins\editor.py:582
 msgid "&Print..."
 msgstr "Im&primer..."
 
-#: spyderlib\plugins\editor.py:572
+#: spyderlib\plugins\editor.py:583
 msgid "Print current file..."
 msgstr "Imprimer le fichier en cours d'édition..."
 
-#: spyderlib\plugins\editor.py:574
+#: spyderlib\plugins\editor.py:587
 msgid "&Close"
 msgstr "&Fermer"
 
-#: spyderlib\plugins\editor.py:575
+#: spyderlib\plugins\editor.py:588
 msgid "Close current file"
 msgstr "Fermer le fichier en cours d'édition"
 
-#: spyderlib\plugins\editor.py:579
+#: spyderlib\plugins\editor.py:592
 msgid "C&lose all"
 msgstr "Fermer t&out"
 
-#: spyderlib\plugins\editor.py:580
+#: spyderlib\plugins\editor.py:593
 msgid "Close all opened files"
 msgstr "Fermer tous les fichiers ouverts"
 
-#: spyderlib\plugins\editor.py:586
+#: spyderlib\plugins\editor.py:599
 msgid "Set/Clear breakpoint"
 msgstr "Ajouter/supprimer un point d'arrêt"
 
-#: spyderlib\plugins\editor.py:593
+#: spyderlib\plugins\editor.py:606
 msgid "Set/Edit conditional breakpoint"
 msgstr "Ajouter/modifier un point d'arrêt conditionnel"
 
-#: spyderlib\plugins\editor.py:601
+#: spyderlib\plugins\editor.py:614
 msgid "Clear breakpoints in all files"
 msgstr "Supprimer les points d'arrêt dans tous les fichiers"
 
-#: spyderlib\plugins\editor.py:603
+#: spyderlib\plugins\editor.py:616
 msgid "Breakpoints"
 msgstr "Points d'arrêt"
 
-#: spyderlib\plugins\editor.py:608 spyderlib\plugins\editor.py:1074
-#: spyderlib\spyder.py:471
+#: spyderlib\plugins\editor.py:621 spyderlib\plugins\editor.py:1081
+#: spyderlib\spyder.py:503
 msgid "&Run"
 msgstr "E&xécution"
 
-#: spyderlib\plugins\editor.py:609
+#: spyderlib\plugins\editor.py:622
 msgid "Run active script in a new Python interpreter"
 msgstr "Exécuter le script actuel dans un nouvel interpréteur Python"
 
-#: spyderlib\plugins\editor.py:613
+#: spyderlib\plugins\editor.py:626
 msgid "&Debug"
 msgstr "&Déboguer"
 
-#: spyderlib\plugins\editor.py:614
+#: spyderlib\plugins\editor.py:627
 msgid ""
 "Debug current script in external console\n"
 "(external console is executed in a separate process)"
@@ -666,27 +736,27 @@
 "Déboguer le script en cours d'édition dans la console externe\n"
 "(la console externe est exécutée dans un processus séparé)"
 
-#: spyderlib\plugins\editor.py:621
+#: spyderlib\plugins\editor.py:634
 msgid "&Configure..."
 msgstr "&Configurer..."
 
-#: spyderlib\plugins\editor.py:622
+#: spyderlib\plugins\editor.py:635
 msgid "Edit run configurations"
 msgstr "Modifier les configurations d'exécution des scripts récents"
 
-#: spyderlib\plugins\editor.py:627
+#: spyderlib\plugins\editor.py:640
 msgid "Re-run &last script"
 msgstr "Exécuter de nouveau le &dernier script"
 
-#: spyderlib\plugins\editor.py:628
+#: spyderlib\plugins\editor.py:641
 msgid "Run again last script in external console with the same options"
 msgstr "Exécuter de nouveau le dernier script avec les mêmes options"
 
-#: spyderlib\plugins\editor.py:635
+#: spyderlib\plugins\editor.py:648
 msgid "Run &selection or current block"
 msgstr "Exécuter la &sélection ou le bloc de lignes"
 
-#: spyderlib\plugins\editor.py:637
+#: spyderlib\plugins\editor.py:650
 msgid ""
 "Run selected text or current block of lines \n"
 "inside current external console's interpreter"
@@ -694,155 +764,153 @@
 "Exécuter le texte sélectionné ou le bloc de lignes \n"
 "dans l'interpréteur de la console externe active"
 
-#: spyderlib\plugins\editor.py:644
+#: spyderlib\plugins\editor.py:657
 msgid "Show todo list"
 msgstr "Afficher la liste des tâches"
 
-#: spyderlib\plugins\editor.py:645
+#: spyderlib\plugins\editor.py:658
 msgid "Show TODO/FIXME/XXX/HINT/TIP comments list"
 msgstr "Afficher la liste des commentaires du type TODO/FIXME/XXX/HINT/TIP"
 
-#: spyderlib\plugins\editor.py:653
+#: spyderlib\plugins\editor.py:666
 msgid "Show warning/error list"
 msgstr "Afficher la liste des avertissements/erreurs"
 
-#: spyderlib\plugins\editor.py:654
+#: spyderlib\plugins\editor.py:667
 msgid "Show code analysis warnings/errors"
 msgstr ""
 "Afficher la liste des avertissements/erreurs provenant de l'analyse de code"
 
-#: spyderlib\plugins\editor.py:661
+#: spyderlib\plugins\editor.py:674
 msgid "Previous warning/error"
 msgstr "Avertissement suivant"
 
-#: spyderlib\plugins\editor.py:662
+#: spyderlib\plugins\editor.py:675
 msgid "Go to previous code analysis warning/error"
 msgstr "Afficher le message d'avertissement ou d'erreur suivant"
 
-#: spyderlib\plugins\editor.py:665
+#: spyderlib\plugins\editor.py:678
 msgid "Next warning/error"
 msgstr "Avertissement précédent"
 
-#: spyderlib\plugins\editor.py:666
+#: spyderlib\plugins\editor.py:679
 msgid "Go to next code analysis warning/error"
 msgstr "Afficher le message d'avertissement ou d'erreur précédent"
 
-#: spyderlib\plugins\editor.py:670
+#: spyderlib\plugins\editor.py:683
 msgid "Last edit location"
 msgstr "Dernière position d'édition"
 
-#: spyderlib\plugins\editor.py:671
+#: spyderlib\plugins\editor.py:684
 msgid "Go to last edit location"
 msgstr "Aller à la dernière position d'édition"
 
-#: spyderlib\plugins\editor.py:678
+#: spyderlib\plugins\editor.py:691
 msgid "Previous cursor position"
 msgstr "Position suivante du curseur"
 
-#: spyderlib\plugins\editor.py:679
+#: spyderlib\plugins\editor.py:692
 msgid "Go to previous cursor position"
 msgstr "Aller à la position précédente du curseur"
 
-#: spyderlib\plugins\editor.py:686
+#: spyderlib\plugins\editor.py:699
 msgid "Next cursor position"
 msgstr "Position suivante du curseur"
 
-#: spyderlib\plugins\editor.py:687
+#: spyderlib\plugins\editor.py:700
 msgid "Go to next cursor position"
 msgstr "Aller à la position suivante du curseur"
 
-#: spyderlib\plugins\editor.py:694
-msgid "Co&mment"
-msgstr "Co&mmenter"
-
-#: spyderlib\plugins\editor.py:695
+#: spyderlib\plugins\editor.py:707
+#: spyderlib\widgets\sourcecode\codeeditor.py:1967
+msgid "Comment"
+msgstr "Commenter"
+
+#: spyderlib\plugins\editor.py:707
+#: spyderlib\widgets\sourcecode\codeeditor.py:1967
+msgid "Uncomment"
+msgstr "Décommenter"
+
+#: spyderlib\plugins\editor.py:708
 msgid "Comment current line or selection"
 msgstr "Commenter la sélection ou la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:700
-msgid "&Uncomment"
-msgstr "&Décommenter"
-
-#: spyderlib\plugins\editor.py:701
-msgid "Uncomment current line or selection"
-msgstr "Décommenter la sélection ou la ligne en cours d'édition"
-
-#: spyderlib\plugins\editor.py:705
+#: spyderlib\plugins\editor.py:712
 msgid "Add &block comment"
 msgstr "Ajouter un &bloc de commentaires"
 
-#: spyderlib\plugins\editor.py:706
+#: spyderlib\plugins\editor.py:713
 msgid "Add block comment around current line or selection"
 msgstr ""
 "Ajouter un bloc de commentaires autour de la sélection ou de la ligne en "
 "cours d'édition"
 
-#: spyderlib\plugins\editor.py:712
+#: spyderlib\plugins\editor.py:719
 msgid "R&emove block comment"
 msgstr "&Supprimer un bloc de commentaires"
 
-#: spyderlib\plugins\editor.py:713
+#: spyderlib\plugins\editor.py:720
 msgid "Remove comment block around current line or selection"
 msgstr ""
 "Supprimer le bloc de commentaires autour de la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:724
+#: spyderlib\plugins\editor.py:731
 msgid "Indent"
 msgstr "Indenter"
 
-#: spyderlib\plugins\editor.py:725
+#: spyderlib\plugins\editor.py:732
 msgid "Indent current line or selection"
 msgstr "Indenter la sélection ou la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:728
+#: spyderlib\plugins\editor.py:735
 msgid "Unindent"
 msgstr "Désindenter"
 
-#: spyderlib\plugins\editor.py:729
+#: spyderlib\plugins\editor.py:736
 msgid "Unindent current line or selection"
 msgstr "Désindenter la sélection ou la ligne en cours d'édition"
 
-#: spyderlib\plugins\editor.py:733
+#: spyderlib\plugins\editor.py:740
 msgid "Debug with winpdb"
 msgstr "Déboguer avec winpdb"
 
-#: spyderlib\plugins\editor.py:740
+#: spyderlib\plugins\editor.py:747
 msgid "Carriage return and line feed (Windows)"
 msgstr "Retour chariot et retour à la ligne (Windows)"
 
-#: spyderlib\plugins\editor.py:743
+#: spyderlib\plugins\editor.py:750
 msgid "Line feed (UNIX)"
 msgstr "Retour à la ligne (UNIX)"
 
-#: spyderlib\plugins\editor.py:746
+#: spyderlib\plugins\editor.py:753
 msgid "Carriage return (Mac)"
 msgstr "Retour chariot (Mac)"
 
-#: spyderlib\plugins\editor.py:752
+#: spyderlib\plugins\editor.py:759
 msgid "Convert end-of-line characters"
 msgstr "Convertir les caractères de fin de ligne"
 
-#: spyderlib\plugins\editor.py:756
+#: spyderlib\plugins\editor.py:763
 msgid "Remove trailing spaces"
 msgstr "Supprimer les espaces en fin de ligne"
 
-#: spyderlib\plugins\editor.py:758
+#: spyderlib\plugins\editor.py:765
 msgid "Fix indentation"
 msgstr "Corriger l'indentation"
 
-#: spyderlib\plugins\editor.py:759
+#: spyderlib\plugins\editor.py:766
 msgid "Replace tab characters by space characters"
 msgstr "Remplacer les caractères de tabulation par des espaces"
 
-#: spyderlib\plugins\editor.py:762
+#: spyderlib\plugins\editor.py:769
 msgid "Go to line..."
 msgstr "Aller à la ligne..."
 
-#: spyderlib\plugins\editor.py:770
+#: spyderlib\plugins\editor.py:777
 msgid "Set console working directory"
 msgstr "Répertoire de travail de la console"
 
-#: spyderlib\plugins\editor.py:772
+#: spyderlib\plugins\editor.py:779
 msgid ""
 "Set current console (and file explorer) working directory to current script "
 "directory"
@@ -850,134 +918,167 @@
 "Choisir le répertoire du script comme répertoire de travail de la console "
 "courante (et de l'explorateur de fichier)"
 
-#: spyderlib\plugins\editor.py:777
+#: spyderlib\plugins\editor.py:784
 msgid "Maximum number of recent files..."
 msgstr "Nombre maximum de fichiers récents..."
 
-#: spyderlib\plugins\editor.py:780
+#: spyderlib\plugins\editor.py:787
 msgid "Clear recent files list"
 msgstr "Effacer la liste des fichiers récents"
 
-#: spyderlib\plugins\editor.py:780
+#: spyderlib\plugins\editor.py:787
 msgid "Clear this list"
 msgstr "Effacer cette liste"
 
-#: spyderlib\plugins\editor.py:782
+#: spyderlib\plugins\editor.py:789
 msgid "Open &recent"
 msgstr "Fichiers &récents"
 
-#: spyderlib\plugins\editor.py:1063 spyderlib\spyder.py:452
+#: spyderlib\plugins\editor.py:1070 spyderlib\spyder.py:484
 msgid "File toolbar"
 msgstr "Barre d'outil fichiers"
 
-#: spyderlib\plugins\editor.py:1064 spyderlib\spyder.py:462
+#: spyderlib\plugins\editor.py:1071 spyderlib\spyder.py:494
 msgid "Search toolbar"
 msgstr "Barre d'outil de recherche"
 
-#: spyderlib\plugins\editor.py:1065 spyderlib\spyder.py:467
+#: spyderlib\plugins\editor.py:1072 spyderlib\spyder.py:499
 msgid "Source toolbar"
 msgstr "Barre d'outils code source"
 
-#: spyderlib\plugins\editor.py:1066 spyderlib\spyder.py:472
+#: spyderlib\plugins\editor.py:1073 spyderlib\spyder.py:504
 msgid "Run toolbar"
 msgstr "Barre d'outil exécution"
 
-#: spyderlib\plugins\editor.py:1067 spyderlib\spyder.py:457
+#: spyderlib\plugins\editor.py:1074 spyderlib\spyder.py:489
 msgid "Edit toolbar"
 msgstr "Barre d'outil édition"
 
-#: spyderlib\plugins\editor.py:1070 spyderlib\spyder.py:449
+#: spyderlib\plugins\editor.py:1077 spyderlib\spyder.py:481
 msgid "&File"
 msgstr "&Fichier"
 
-#: spyderlib\plugins\editor.py:1071 spyderlib\spyder.py:456
+#: spyderlib\plugins\editor.py:1078 spyderlib\spyder.py:488
 msgid "&Edit"
 msgstr "&Édition"
 
-#: spyderlib\plugins\editor.py:1072 spyderlib\spyder.py:461
+#: spyderlib\plugins\editor.py:1079 spyderlib\spyder.py:493
 msgid "&Search"
 msgstr "&Recherche"
 
-#: spyderlib\plugins\editor.py:1073 spyderlib\spyder.py:466
+#: spyderlib\plugins\editor.py:1080 spyderlib\spyder.py:498
 msgid "Sour&ce"
 msgstr "Sour&ce"
 
-#: spyderlib\plugins\editor.py:1075 spyderlib\spyder.py:476
+#: spyderlib\plugins\editor.py:1082 spyderlib\spyder.py:511
 msgid "&Tools"
 msgstr "Ou&tils"
 
-#: spyderlib\plugins\editor.py:1076
+#: spyderlib\plugins\editor.py:1083
 msgid "?"
 msgstr "?"
 
-#: spyderlib\plugins\editor.py:1298
+#: spyderlib\plugins\editor.py:1294
 msgid "Spyder Editor"
 msgstr "Éditeur de Spyder"
 
-#: spyderlib\plugins\editor.py:1299
+#: spyderlib\plugins\editor.py:1295
 msgid "This temporary script file is located here:"
 msgstr "Ce script temporaire est sauvegardé ici :"
 
-#: spyderlib\plugins\editor.py:1349
+#: spyderlib\plugins\editor.py:1352
 msgid "untitled"
 msgstr "sanstitre"
 
-#: spyderlib\plugins\editor.py:1413
+#: spyderlib\plugins\editor.py:1422
 msgid "Maximum number of recent files"
 msgstr "Nombre maximum de fichiers récents"
 
-#: spyderlib\plugins\editor.py:1444 spyderlib\plugins\workingdirectory.py:71
+#: spyderlib\plugins\editor.py:1453 spyderlib\plugins\workingdirectory.py:69
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: spyderlib\plugins\editor.py:1513
+#: spyderlib\plugins\editor.py:1531
 msgid "Printing..."
 msgstr "Impression en cours..."
 
-#: spyderlib\plugins\editor.py:1529
-msgid "Print"
-msgstr "Impression"
-
-#: spyderlib\plugins\editor.py:1530
-msgid "<b>Unable to print document '%s'</b>"
-msgstr "<b>Impossible d'imprimer le document '%s'</b>"
-
-#: spyderlib\plugins\explorer.py:55
+#: spyderlib\plugins\explorer.py:47
 msgid "File explorer"
 msgstr "Explorateur de fichiers"
 
-#: spyderlib\plugins\explorer.py:68 spyderlib\plugins\inspector.py:218
-#: spyderlib\plugins\projectexplorer.py:66
+#: spyderlib\plugins\explorer.py:60 spyderlib\plugins\inspector.py:221
+#: spyderlib\plugins\projectexplorer.py:57
 msgid "Set font style"
 msgstr "Changer la police d'écriture"
 
-#: spyderlib\plugins\externalconsole.py:43
+#: spyderlib\plugins\externalconsole.py:42
+#: spyderlib\plugins\externalconsole.py:865 spyderlib\plugins\inspector.py:247
+#: spyderlib\widgets\externalshell\baseshell.py:104
+msgid "Console"
+msgstr "Console"
+
+#: spyderlib\plugins\externalconsole.py:49
 msgid "One tab per script"
 msgstr "Un onglet par script"
 
-#: spyderlib\plugins\externalconsole.py:44
-#: spyderlib\widgets\externalshell\baseshell.py:164
+#: spyderlib\plugins\externalconsole.py:50
+#: spyderlib\widgets\externalshell\baseshell.py:169
 msgid "Show elapsed time"
 msgstr "Afficher le temps écoulé"
 
-#: spyderlib\plugins\externalconsole.py:45 spyderlib\widgets\explorer.py:532
+#: spyderlib\plugins\externalconsole.py:51 spyderlib\widgets\explorer.py:952
 msgid "Show icons and text"
 msgstr "Afficher icônes et textes"
 
-#: spyderlib\plugins\externalconsole.py:57
+#: spyderlib\plugins\externalconsole.py:63
 msgid " lines"
 msgstr " lignes"
 
-#: spyderlib\plugins\externalconsole.py:57
+#: spyderlib\plugins\externalconsole.py:63
 msgid "Buffer: "
 msgstr "Tampon : "
 
 #: spyderlib\plugins\externalconsole.py:68
-#: spyderlib\widgets\arrayeditor.py:385
+msgid "Merge process standard output/error channels"
+msgstr "Fusionner les canaux de sortie et d'erreur du processus"
+
+#: spyderlib\plugins\externalconsole.py:70
+msgid ""
+"Merging the output channels of the process means that\n"
+"the standard error won't be written in red anymore,\n"
+"but this has the effect of speeding up display.\n"
+"\n"
+"This option has no effect on IPython."
+msgstr ""
+"Fusionner les canaux de sortie et d'erreur du processus\n"
+"signifie que les erreurs ne seront plus affichées en rouge,\n"
+"mais cela entraînera également une amélioration des performances\n"
+"d'affichage et une meilleure réactivité de la console.\n"
+"\n"
+"Cette option n'a aucun effet sur les interpréteurs IPython."
+
+#: spyderlib\plugins\externalconsole.py:75
+msgid "Colorize standard error channel using ANSI escape codes"
+msgstr "Coloriser le canal d'erreur standard (codes d'échappement ANSI)"
+
+#: spyderlib\plugins\externalconsole.py:77
+msgid ""
+"This method is the only way to have colorized standard\n"
+"error channel when the output channels have been merged.\n"
+"\n"
+"This option has no effect on IPython."
+msgstr ""
+"Cette méthode est le seul moyen de coloriser le canal\n"
+"d'erreur standard lorsque les canaux de sorties ont été fusionnés.\n"
+"\n"
+"Cette option n'a aucun effet sur les interpréteurs IPython."
+
+#: spyderlib\plugins\externalconsole.py:95
+#: spyderlib\widgets\arrayeditor.py:393
 msgid "Background color"
 msgstr "Couleur de fond"
 
-#: spyderlib\plugins\externalconsole.py:69
+#: spyderlib\plugins\externalconsole.py:96
 msgid ""
 "This option will be applied the next time a Python console or a terminal is "
 "opened."
@@ -985,15 +1086,15 @@
 "Cette option sera prise en compte lors de la prochaine ouverture de console "
 "(interpréteur Python ou terminal)."
 
-#: spyderlib\plugins\externalconsole.py:72
+#: spyderlib\plugins\externalconsole.py:99
 msgid "Light background (white color)"
 msgstr "Fond blanc"
 
-#: spyderlib\plugins\externalconsole.py:74
+#: spyderlib\plugins\externalconsole.py:101
 msgid "Set the appropriate IPython color option"
 msgstr "Utiliser le réglage de couleur IPython approprié"
 
-#: spyderlib\plugins\externalconsole.py:97
+#: spyderlib\plugins\externalconsole.py:125
 msgid ""
 "If this option is enabled, object inspector\n"
 "will automatically show informations on functions\n"
@@ -1005,23 +1106,24 @@
 "déclenché par la saisie d'une parenthèse gauche après un nom valide de "
 "fonction)"
 
-#: spyderlib\plugins\externalconsole.py:112
+#: spyderlib\plugins\externalconsole.py:140
 msgid "User Module Deleter (UMD)"
 msgstr "User Module Deleter (UMD)"
 
-#: spyderlib\plugins\externalconsole.py:113
+#: spyderlib\plugins\externalconsole.py:141
 msgid ""
-"UMD forces Python to reload modules imported when executing a script in the "
-"external console with the 'runfile' function"
+"UMD forces Python to reload modules which were imported when executing a \n"
+"script in the external console with the 'runfile' function."
 msgstr ""
-"L'UMD force Python à recharger les modules importés lors de l'exécution d'un "
-"script dans la console interne avec la fonction 'runfile'"
+"L'UMD force Python à recharger les modules importés lors de l'exécution "
+"d'un\n"
+"script dans la console interne avec la fonction 'runfile'."
 
-#: spyderlib\plugins\externalconsole.py:117
+#: spyderlib\plugins\externalconsole.py:144
 msgid "Enable UMD"
 msgstr "Activer l'UMD"
 
-#: spyderlib\plugins\externalconsole.py:118
+#: spyderlib\plugins\externalconsole.py:145
 msgid ""
 "This option will enable the User Module Deleter (UMD) in Python/IPython "
 "interpreters. UMD forces Python to reload deeply modules during import when "
@@ -1046,12 +1148,12 @@
 "l'attribut <b>Qt.WA_DeleteOnClose</b> sur votre objet fenêtre principale "
 "grâce à la méthode <b>setAttribute</b>)"
 
-#: spyderlib\plugins\externalconsole.py:134
+#: spyderlib\plugins\externalconsole.py:161
 msgid "Show reloaded modules list"
 msgstr "Afficher les modules rechargés"
 
-#: spyderlib\plugins\externalconsole.py:135
-#: spyderlib\plugins\externalconsole.py:888
+#: spyderlib\plugins\externalconsole.py:162
+#: spyderlib\plugins\externalconsole.py:1149
 msgid ""
 "Please note that these changes will be applied only to new Python/IPython "
 "interpreters"
@@ -1059,28 +1161,70 @@
 "Veuillez noter que ces changements ne seront pris en compte que par les "
 "nouveaux interpréteurs Python/IPython"
 
-#: spyderlib\plugins\externalconsole.py:141
+#: spyderlib\plugins\externalconsole.py:168
 msgid "Set UMD excluded (not reloaded) modules"
 msgstr "Modifier la liste des modules non rechargés par l'UMD"
 
-#: spyderlib\plugins\externalconsole.py:153
-#: spyderlib\plugins\workingdirectory.py:44
+#: spyderlib\plugins\externalconsole.py:180
+msgid "Python executable"
+msgstr "Exécutable Python"
+
+#: spyderlib\plugins\externalconsole.py:181
+msgid "Path to Python interpreter executable binary:"
+msgstr "Emplacement de l'exécutable de l'interpréteur Python :"
+
+#: spyderlib\plugins\externalconsole.py:184
+msgid "Executables"
+msgstr "Exécutables"
+
+#: spyderlib\plugins\externalconsole.py:196
+#: spyderlib\plugins\workingdirectory.py:42
 msgid "Startup"
 msgstr "Démarrage"
 
-#: spyderlib\plugins\externalconsole.py:154
+#: spyderlib\plugins\externalconsole.py:197
 msgid "Open a Python interpreter at startup"
 msgstr "Ouvrir un interpréteur Python au démarrage"
 
-#: spyderlib\plugins\externalconsole.py:156
+#: spyderlib\plugins\externalconsole.py:199
 msgid "Open an IPython interpreter at startup"
 msgstr "Ouvrir un interpréteur IPython au démarrage"
 
-#: spyderlib\plugins\externalconsole.py:166
+#: spyderlib\plugins\externalconsole.py:205
+msgid ""
+"This option is not available for IPython\n"
+"versions which are not fully supported\n"
+"through Spyder's console (i.e. IPython v0.11+)."
+msgstr ""
+"Cette option est désactivée pour les versions de IPython\n"
+"qui ne sont entièrement prises en charge par Spyder\n"
+"à travers la console (i.e. IPython v0.11+)."
+
+#: spyderlib\plugins\externalconsole.py:215
+msgid "PYTHONSTARTUP replacement"
+msgstr "Substitution de PYTHONSTARTUP"
+
+#: spyderlib\plugins\externalconsole.py:216
+msgid ""
+"This option will override the PYTHONSTARTUP environment variable which\n"
+"defines the script to be executed during the Python interpreter startup."
+msgstr ""
+"Cette option permet de remplacer le script de démarrage défini par la\n"
+"variable d'environnement PYTHONSTARTUP."
+
+#: spyderlib\plugins\externalconsole.py:221
+msgid "Default PYTHONSTARTUP script"
+msgstr "Script PYTHONSTARTUP par défaut"
+
+#: spyderlib\plugins\externalconsole.py:224
+msgid "Use the following startup script:"
+msgstr "Utiliser le script de démarrage suivant :"
+
+#: spyderlib\plugins\externalconsole.py:242
 msgid "Monitor"
 msgstr "Moniteur"
 
-#: spyderlib\plugins\externalconsole.py:167
+#: spyderlib\plugins\externalconsole.py:243
 msgid ""
 "The monitor provides introspection features to console: code completion, "
 "calltips and variable explorer. Because it relies on several modules, "
@@ -1091,75 +1235,146 @@
 "Parce qu'il nécessite l'import de nombreux modules, désactiver le moniteur "
 "permet d'accélérer le démarrage de la console."
 
-#: spyderlib\plugins\externalconsole.py:174
+#: spyderlib\plugins\externalconsole.py:250
 msgid "Enable monitor"
 msgstr "Activer le moniteur"
 
-#: spyderlib\plugins\externalconsole.py:186
+#: spyderlib\plugins\externalconsole.py:280
+msgid "Qt (PyQt/PySide)"
+msgstr "Qt (PyQt/PySide)"
+
+#: spyderlib\plugins\externalconsole.py:282
+msgid "Qt-Python bindings library selection:"
+msgstr "Sélection de la bibliothèque d'interfaçage Qt :"
+
+#: spyderlib\plugins\externalconsole.py:283
+msgid "Default library"
+msgstr "Bibliothèque par défaut"
+
+#: spyderlib\plugins\externalconsole.py:284
+msgid "This option will act on libraries such as Matplotlib, guidata or ETS"
+msgstr ""
+"Cette option est prise en charge par les bibliothèques telles que "
+"Matplotlib, guidata ou ETS"
+
+#: spyderlib\plugins\externalconsole.py:286
+msgid "Install Spyder's input hook for Qt"
+msgstr "Installer le \"input hook\" de Spyder pour Qt"
+
+#: spyderlib\plugins\externalconsole.py:288
+msgid ""
+"PyQt installs an input hook that allows creating and interacting\n"
+"with Qt widgets in an interactive interpreter without blocking it. \n"
+"On Windows platforms, it is strongly recommended to replace it by "
+"Spyder's. \n"
+"Regarding PySide, note that it does not install an input hook, so it is \n"
+"required to enable this feature in order to be able to manipulate PySide/"
+"Qt \n"
+"objects interactively. Note that this feature requires the monitor to be \n"
+"enabled and that it has no effect in IPython."
+msgstr ""
+"PyQt installe un \"input hook\", mécanisme permettant d'interagir\n"
+"avec des widgets Qt dans un interpréteur Python sans bloquer ce dernier. \n"
+"Sous Windows, il est fortement conseillé de le remplacer par celui de "
+"Spyder. \n"
+"Concernant PySide, aucun \"input hook\" n'étant implémenté dans la version "
+"1.0, \n"
+"il est également recommandé d'activer cette option \n"
+"(cette fonctionnalité n'a aucun effet si le moniteur est désactivé \n"
+"ou dans un interpréteur IPython)."
+
+#: spyderlib\plugins\externalconsole.py:304
 msgid "PyQt"
 msgstr "PyQt"
 
-#: spyderlib\plugins\externalconsole.py:187
+#: spyderlib\plugins\externalconsole.py:306
+msgid "API selection for QString and QVariant objects:"
+msgstr "Sélection de l'API des objets QString et QVariant :"
+
+#: spyderlib\plugins\externalconsole.py:307
+msgid "API #1"
+msgstr "API n°1"
+
+#: spyderlib\plugins\externalconsole.py:307
+msgid "API #2"
+msgstr "API n°2"
+
+#: spyderlib\plugins\externalconsole.py:307
+msgid "Default API"
+msgstr "API par défaut"
+
+#: spyderlib\plugins\externalconsole.py:308
 msgid ""
-"PyQt installs an input hook that allows creating and interacting with "
-"widgets in an interactive interpreter without blocking it. It is strongly "
-"recommended to remove it on Windows platforms (it has no effect in IPython)."
+"PyQt API #1 is the default API for Python 2. PyQt API #2 is the default \n"
+"API for Python 3 and is compatible with PySide.\n"
+"Note that switching to API #2 may require to enable the Matplotlib patch."
 msgstr ""
-"PyQt installe un \"input hook\" qui permet d'interagir avec des widgets dans "
-"un interpréteur Python sans bloquer ce dernier. Il est fortement conseillé "
-"de le supprimer sous Windows."
-
-#: spyderlib\plugins\externalconsole.py:193
-msgid "Remove PyQt input hook"
-msgstr "Supprimer le \"input hook\" de PyQt"
-
-#: spyderlib\plugins\externalconsole.py:195
+"L'API n°1 de PyQt est l'API par défaut pour Python 2. L'API n°2 est l'API \n"
+"par défaut pour Python 3 : c'est l'API qui est compatible avec PySide.\n"
+"La sélection de l'API n°2 peut nécessiter l'activation du patch de "
+"Matplotlib."
+
+#: spyderlib\plugins\externalconsole.py:312
 msgid "Ignore API change errors (sip.setapi)"
 msgstr "Ignorer les erreurs de changement d'API (sip.setapi)"
 
-#: spyderlib\plugins\externalconsole.py:210
-msgid "IPython"
-msgstr "IPython"
-
-#: spyderlib\plugins\externalconsole.py:211
-msgid ""
-"IPython interpreter command line options:\n"
-"(Qt4 and matplotlib support: -q4thread -pylab)"
-msgstr ""
-"Options en ligne de commande de IPython :\n"
-"(support Qt4 et matplotlib : -q4thread -pylab)"
-
-#: spyderlib\plugins\externalconsole.py:222
+#: spyderlib\plugins\externalconsole.py:313
+msgid ""
+"Enabling this option will ignore errors when changing PyQt API.\n"
+"As PyQt does not support dynamic API changes, it is strongly recommended\n"
+"to use this feature wisely, e.g. for debugging purpose."
+msgstr ""
+"L'activation de cette option permet d'ignorer les erreurs liées aux "
+"changements\n"
+"d'API de PyQt. Vu que PyQt ne prend pas en charge le changement dynamique\n"
+" d'API, il est fortement recommandé d'utiliser cette fonctionnalité "
+"exceptionnellement,\n"
+"par exemple pour du débogage."
+
+#: spyderlib\plugins\externalconsole.py:332
+msgid "IPython interpreter command line options"
+msgstr "IPython : options en ligne de commande"
+
+#: spyderlib\plugins\externalconsole.py:344
+msgid ""
+"<b>Note:</b><br>IPython >=<u>v0.10</u> is not installed on this computer."
+msgstr ""
+"<b>Note :</b><br>IPython >=<u>v0.10</u> n'est pas installé sur cet "
+"ordinateur."
+
+#: spyderlib\plugins\externalconsole.py:353
 msgid "Matplotlib"
 msgstr "Matplotlib"
 
-#: spyderlib\plugins\externalconsole.py:223
+#: spyderlib\plugins\externalconsole.py:355
+msgid "GUI backend:"
+msgstr "Backend graphique :"
+
+#: spyderlib\plugins\externalconsole.py:357
+msgid ""
+"Set the GUI toolkit used by Matplotlib to show figures (default: Qt4Agg)"
+msgstr ""
+"Spécifie la bibliothèque d'interfaces graphiques à utiliser pour l'affichage "
+"des figures Matplotlib (par défaut : Qt4Agg)"
+
+#: spyderlib\plugins\externalconsole.py:367
+msgid "Patch Matplotlib figures"
+msgstr "Patcher les figures Matplotlib"
+
+#: spyderlib\plugins\externalconsole.py:369
 msgid ""
 "Patching Matplotlib library will add a button to customize figure options "
-"(curves/images plot parameters)."
+"(Qt4Agg only) and fix some issues."
 msgstr ""
 "Appliquer un patch à la bibliothèque Matplotlib permet d'ajouter un bouton "
-"pour modifier les options des courbes et images affichées."
-
-#: spyderlib\plugins\externalconsole.py:227
-msgid "Patch Matplotlib figures"
-msgstr "Patcher les figures Matplotlib"
-
-#: spyderlib\plugins\externalconsole.py:229
-msgid "Matplotlib backend (default: Qt4Agg):"
-msgstr "Backend Matplotlib (valeur par défaut: Qt4Agg) :"
-
-#: spyderlib\plugins\externalconsole.py:232
-msgid "Set the GUI toolkit used by Matplotlib to show figures"
-msgstr ""
-"Spécifie la bibliothèque d'interfaces graphiques à utiliser pour l'affichage "
-"des figures Matplotlib"
-
-#: spyderlib\plugins\externalconsole.py:248
+"(au backend Qt4Agg) pour modifier les options des courbes et images "
+"affichées et de corriger quelques bogues."
+
+#: spyderlib\plugins\externalconsole.py:391
 msgid "Enthought Tool Suite"
 msgstr "Enthought Tool Suite"
 
-#: spyderlib\plugins\externalconsole.py:249
+#: spyderlib\plugins\externalconsole.py:392
 msgid ""
 "Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
 "user interfaces."
@@ -1167,15 +1382,15 @@
 "Le logiciel Enthought Tool Suite (ETS) prend en charge les interfaces "
 "graphiques PyQt4 (qt4) et wxPython (wx)."
 
-#: spyderlib\plugins\externalconsole.py:253
-msgid "ETS_TOOLKIT (default value: qt4):"
-msgstr "ETS_TOOLKIT (valeur par défaut: qt4) :"
+#: spyderlib\plugins\externalconsole.py:396
+msgid "ETS_TOOLKIT:"
+msgstr "ETS_TOOLKIT:"
 
-#: spyderlib\plugins\externalconsole.py:275
+#: spyderlib\plugins\externalconsole.py:417
 msgid "External modules"
 msgstr "Modules externes"
 
-#: spyderlib\plugins\externalconsole.py:473
+#: spyderlib\plugins\externalconsole.py:644
 msgid ""
 "%s is already running in a separate process.\n"
 "Do you want to kill the process before starting a new one?"
@@ -1183,58 +1398,57 @@
 "%s est déjà en cours d'exécution dans un processus séparé.\n"
 "Souhaitez-vous tuer ce processus avant d'en démarrer un autre ?"
 
-#: spyderlib\plugins\externalconsole.py:597
+#: spyderlib\plugins\externalconsole.py:803
 msgid "Command Window"
 msgstr "Invite de commandes"
 
-#: spyderlib\plugins\externalconsole.py:599
+#: spyderlib\plugins\externalconsole.py:805
 msgid "Terminal"
 msgstr "Terminal"
 
-#: spyderlib\plugins\externalconsole.py:653 spyderlib\plugins\inspector.py:244
-#: spyderlib\widgets\externalshell\baseshell.py:99
-msgid "Console"
-msgstr "Console"
-
-#: spyderlib\plugins\externalconsole.py:669
+#: spyderlib\plugins\externalconsole.py:887
 msgid "Open &interpreter"
 msgstr "Ouvrir un &interpréteur"
 
-#: spyderlib\plugins\externalconsole.py:670
+#: spyderlib\plugins\externalconsole.py:888
 msgid "Open a Python interpreter"
 msgstr "Ouvrir un interpréteur Python"
 
-#: spyderlib\plugins\externalconsole.py:673
+#: spyderlib\plugins\externalconsole.py:891
 msgid "Open &command prompt"
 msgstr "Ouvrir un invite de &commandes"
 
-#: spyderlib\plugins\externalconsole.py:674
+#: spyderlib\plugins\externalconsole.py:892
 msgid "Open a Windows command prompt"
 msgstr "Ouvrir un invite de commandes Windows"
 
-#: spyderlib\plugins\externalconsole.py:676
+#: spyderlib\plugins\externalconsole.py:894
 msgid "Open &terminal"
 msgstr "Ouvrir un &terminal"
 
-#: spyderlib\plugins\externalconsole.py:677
+#: spyderlib\plugins\externalconsole.py:895
 msgid "Open a terminal window inside Spyder"
 msgstr "Ouvrir un terminal de commandes dans Spyder"
 
-#: spyderlib\plugins\externalconsole.py:690
+#: spyderlib\plugins\externalconsole.py:908
+msgid "Start a new IPython kernel"
+msgstr "Démarrer un nouveau noyau IPython"
+
+#: spyderlib\plugins\externalconsole.py:915
 msgid "Open IPython interpreter"
 msgstr "Ouvrir un interpréteur IPython"
 
-#: spyderlib\plugins\externalconsole.py:692
+#: spyderlib\plugins\externalconsole.py:917
 msgid "Open an IPython interpreter"
 msgstr "Ouvrir un interpréteur IPython"
 
-#: spyderlib\plugins\externalconsole.py:870
-#: spyderlib\plugins\externalconsole.py:883
-#: spyderlib\plugins\externalconsole.py:887
+#: spyderlib\plugins\externalconsole.py:1131
+#: spyderlib\plugins\externalconsole.py:1144
+#: spyderlib\plugins\externalconsole.py:1148
 msgid "UMD"
 msgstr "UMD"
 
-#: spyderlib\plugins\externalconsole.py:871
+#: spyderlib\plugins\externalconsole.py:1132
 msgid ""
 "UMD excluded modules:\n"
 "(example: guidata, guiqwt)"
@@ -1242,7 +1456,7 @@
 "Modules non rechargés par l'UMD :\n"
 "(exemple: guidata, guiqwt)"
 
-#: spyderlib\plugins\externalconsole.py:884
+#: spyderlib\plugins\externalconsole.py:1145
 msgid ""
 "The following modules are not installed on your machine:\n"
 "%s"
@@ -1250,54 +1464,58 @@
 "Les modules suivants ne sont pas installés sur votre ordinateur :\n"
 "%s"
 
-#: spyderlib\plugins\findinfiles.py:86 spyderlib\widgets\findinfiles.py:701
+#: spyderlib\plugins\findinfiles.py:89 spyderlib\widgets\findinfiles.py:695
 msgid "Find in files"
 msgstr "Recherche dans des fichiers"
 
-#: spyderlib\plugins\findinfiles.py:110
+#: spyderlib\plugins\findinfiles.py:113
 msgid "&Find in files"
 msgstr "Rechercher dans des &fichiers"
 
-#: spyderlib\plugins\findinfiles.py:113
+#: spyderlib\plugins\findinfiles.py:116
 msgid "Search text in multiple files"
 msgstr "Rechercher une chaîne de caractères dans plusieurs fichiers à la fois"
 
-#: spyderlib\plugins\history.py:32
+#: spyderlib\plugins\history.py:29
 msgid "Settings"
 msgstr "Options"
 
-#: spyderlib\plugins\history.py:34
+#: spyderlib\plugins\history.py:31
 msgid " entries"
 msgstr " lignes"
 
-#: spyderlib\plugins\history.py:34
+#: spyderlib\plugins\history.py:31
 msgid "History depth: "
 msgstr "Taille de l'historique : "
 
-#: spyderlib\plugins\history.py:94 spyderlib\plugins\inspector.py:297
-#: spyderlib\widgets\editor.py:553 spyderlib\widgets\explorer.py:567
-#: spyderlib\widgets\externalshell\baseshell.py:144
-#: spyderlib\widgets\externalshell\namespacebrowser.py:206
+#: spyderlib\plugins\history.py:38
+msgid "Scroll automatically to last entry"
+msgstr "Défiler automatiquement jusqu'à la dernière ligne"
+
+#: spyderlib\plugins\history.py:97 spyderlib\plugins\inspector.py:300
+#: spyderlib\widgets\editor.py:610 spyderlib\widgets\explorer.py:982
+#: spyderlib\widgets\externalshell\baseshell.py:149
+#: spyderlib\widgets\externalshell\namespacebrowser.py:221
 msgid "Options"
 msgstr "Options"