diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py index f51cce9..fd93d37 100644 --- a/IPython/core/formatters.py +++ b/IPython/core/formatters.py @@ -1011,7 +1011,7 @@ def format_display_data(obj, include=None, exclude=None): format data dict. If this is set *only* the format types included in this list will be computed. exclude : list or tuple, optional - A list of format type string (MIME types) to exclue in the format + A list of format type string (MIME types) to exclude in the format data dict. If this is set all format types will be computed, except for those included in this argument. """ diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index 6dbf307..d1b59d7 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -3157,7 +3157,7 @@ class InteractiveShell(SingletonConfigurable): Experimental value: 'async' Will try to run top level interactive async/await code in default runner, this will not respect the - interactivty setting and will only run the last node if it is an + interactivity setting and will only run the last node if it is an expression. compiler : callable diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py index 9031e47..d9e66b5 100644 --- a/IPython/core/magics/execution.py +++ b/IPython/core/magics/execution.py @@ -1171,7 +1171,7 @@ python-profiler package from non-free.""") if not quiet : # Check best timing is greater than zero to avoid a # ZeroDivisionError. - # In cases where the slowest timing is lesser than a micosecond + # In cases where the slowest timing is lesser than a microsecond # we assume that it does not really matter if the fastest # timing is 4 times faster than the slowest timing or not. if worst > 4 * best and best > 0 and worst > 1e-6: diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py index a309280..c6d1539 100644 --- a/IPython/core/magics/osm.py +++ b/IPython/core/magics/osm.py @@ -58,7 +58,7 @@ class OSMagics(Magics): @skip_doctest def _isexec_POSIX(self, file): """ - Test for executible on a POSIX system + Test for executable on a POSIX system """ if os.access(file.path, os.X_OK): # will fail on maxOS if access is not X_OK @@ -70,14 +70,14 @@ class OSMagics(Magics): @skip_doctest def _isexec_WIN(self, file): """ - Test for executible file on non POSIX system + Test for executable file on non POSIX system """ return file.is_file() and self.execre.match(file.name) is not None @skip_doctest def isexec(self, file): """ - Test for executible file on non POSIX system + Test for executable file on non POSIX system """ if self.is_posix: return self._isexec_POSIX(file) diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py index fe54668..d112704 100644 --- a/IPython/core/tests/test_completerlib.py +++ b/IPython/core/tests/test_completerlib.py @@ -48,7 +48,7 @@ class Test_magic_run_completer(unittest.TestCase): shutil.rmtree(self.BASETESTDIR) def test_1(self): - """Test magic_run_completer, should match two alterntives + """Test magic_run_completer, should match two alternatives """ event = MockEvent(u"%run a") mockself = None @@ -56,7 +56,7 @@ class Test_magic_run_completer(unittest.TestCase): self.assertEqual(match, {u"a.py", u"aao.py", u"adir/"}) def test_2(self): - """Test magic_run_completer, should match one alterntive + """Test magic_run_completer, should match one alternative """ event = MockEvent(u"%run aa") mockself = None @@ -102,7 +102,7 @@ class Test_magic_run_completer_nonascii(unittest.TestCase): @onlyif_unicode_paths def test_1(self): - """Test magic_run_completer, should match two alterntives + """Test magic_run_completer, should match two alternatives """ event = MockEvent(u"%run a") mockself = None @@ -111,7 +111,7 @@ class Test_magic_run_completer_nonascii(unittest.TestCase): @onlyif_unicode_paths def test_2(self): - """Test magic_run_completer, should match one alterntive + """Test magic_run_completer, should match one alternative """ event = MockEvent(u"%run aa") mockself = None diff --git a/IPython/core/tests/test_displayhook.py b/IPython/core/tests/test_displayhook.py index 7c1a9de..6ad8979 100644 --- a/IPython/core/tests/test_displayhook.py +++ b/IPython/core/tests/test_displayhook.py @@ -82,7 +82,7 @@ def test_interactivehooks_ast_modes(): finally: ip.ast_node_interactivity = saved_mode -def test_interactivehooks_ast_modes_semi_supress(): +def test_interactivehooks_ast_modes_semi_suppress(): """ Test that ast nodes can be triggered with different modes and suppressed by semicolon diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py index 23278ef..578ef27 100644 --- a/IPython/core/tests/test_interactiveshell.py +++ b/IPython/core/tests/test_interactiveshell.py @@ -566,7 +566,7 @@ class TestSystemRaw(ExitCodeChecks): def setUp(self): super().setUp() - self.sytem = ip.system_raw + self.system = ip.system_raw @onlyif_unicode_paths def test_1(self): @@ -590,7 +590,7 @@ class TestSystemPipedExitCode(ExitCodeChecks): def setUp(self): super().setUp() - self.sytem = ip.system_piped + self.system = ip.system_piped @skip_win32 def test_exit_code_ok(self): @@ -914,7 +914,7 @@ class TestSyntaxErrorTransformer(unittest.TestCase): ip.run_cell('3456') -class TestWarningSupression(unittest.TestCase): +class TestWarningSuppression(unittest.TestCase): def test_warning_suppression(self): ip.run_cell("import warnings") try: diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py index a27612d..46cd9c3 100644 --- a/IPython/external/qt_loaders.py +++ b/IPython/external/qt_loaders.py @@ -282,7 +282,7 @@ def load_qt(api_options): Raises ------ ImportError, if it isn't possible to import any requested - bindings (either becaues they aren't installed, or because + bindings (either because they aren't installed, or because an incompatible library has already been installed) """ loaders = { diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py index 586b2be..37dd21a 100644 --- a/IPython/lib/deepreload.py +++ b/IPython/lib/deepreload.py @@ -271,7 +271,7 @@ modules_reloading = {} def deep_reload_hook(m): """Replacement for reload().""" - # Hardcode this one as it would raise a NotImplemeentedError from the + # Hardcode this one as it would raise a NotImplementedError from the # bowels of Python and screw up the import machinery after. # unlike other imports the `exclude` list already in place is not enough. diff --git a/IPython/lib/display.py b/IPython/lib/display.py index 8127e90..e7c427c 100644 --- a/IPython/lib/display.py +++ b/IPython/lib/display.py @@ -500,7 +500,7 @@ class FileLinks(FileLink): substituted for the first and fname will be substituted for the second fp_format: string to use for formatting filepaths, must contain - exactly two "%s" and the dirname will be subsituted for the first + exactly two "%s" and the dirname will be substituted for the first and fname will be substituted for the second """ def f(dirname, fnames, included_suffixes=None): diff --git a/IPython/lib/inputhookgtk.py b/IPython/lib/inputhookgtk.py index 2b4b656..98569f5 100644 --- a/IPython/lib/inputhookgtk.py +++ b/IPython/lib/inputhookgtk.py @@ -1,6 +1,6 @@ # encoding: utf-8 """ -Enable pygtk to be used interacive by setting PyOS_InputHook. +Enable pygtk to be used interactively by setting PyOS_InputHook. Authors: Brian Granger """ diff --git a/IPython/lib/inputhookgtk3.py b/IPython/lib/inputhookgtk3.py index d897e19..b797e86 100644 --- a/IPython/lib/inputhookgtk3.py +++ b/IPython/lib/inputhookgtk3.py @@ -1,6 +1,6 @@ # encoding: utf-8 """ -Enable Gtk3 to be used interacive by IPython. +Enable Gtk3 to be used interactively by IPython. Authors: Thomi Richards """ diff --git a/IPython/lib/inputhookpyglet.py b/IPython/lib/inputhookpyglet.py index b82fcf5..fb91ffe 100644 --- a/IPython/lib/inputhookpyglet.py +++ b/IPython/lib/inputhookpyglet.py @@ -1,6 +1,6 @@ # encoding: utf-8 """ -Enable pyglet to be used interacive by setting PyOS_InputHook. +Enable pyglet to be used interactively by setting PyOS_InputHook. Authors ------- diff --git a/IPython/lib/inputhookwx.py b/IPython/lib/inputhookwx.py index 3aac526..60520a2 100644 --- a/IPython/lib/inputhookwx.py +++ b/IPython/lib/inputhookwx.py @@ -1,7 +1,7 @@ # encoding: utf-8 """ -Enable wxPython to be used interacive by setting PyOS_InputHook. +Enable wxPython to be used interactively by setting PyOS_InputHook. Authors: Robin Dunn, Brian Granger, Ondrej Certik """ diff --git a/IPython/lib/tests/test_display.py b/IPython/lib/tests/test_display.py index 20963e2..f56aca4 100644 --- a/IPython/lib/tests/test_display.py +++ b/IPython/lib/tests/test_display.py @@ -52,8 +52,8 @@ def test_instantiation_FileLink(): if sys.version_info >= (3, 6): fl = display.FileLink(pathlib.PurePath('example.txt')) -def test_warning_on_non_existant_path_FileLink(): - """FileLink: Calling _repr_html_ on non-existant files returns a warning +def test_warning_on_non_existent_path_FileLink(): + """FileLink: Calling _repr_html_ on non-existent files returns a warning """ fl = display.FileLink('example.txt') nt.assert_true(fl._repr_html_().startswith('Path (example.txt)')) @@ -91,8 +91,8 @@ def test_instantiation_FileLinks(): """ fls = display.FileLinks('example') -def test_warning_on_non_existant_path_FileLinks(): - """FileLinks: Calling _repr_html_ on non-existant files returns a warning +def test_warning_on_non_existent_path_FileLinks(): + """FileLinks: Calling _repr_html_ on non-existent files returns a warning """ fls = display.FileLinks('example') nt.assert_true(fls._repr_html_().startswith('Path (example)')) diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py index ce5825f..60c1b51 100644 --- a/IPython/sphinxext/ipython_directive.py +++ b/IPython/sphinxext/ipython_directive.py @@ -206,10 +206,10 @@ from traitlets.config import Config from IPython import InteractiveShell from IPython.core.profiledir import ProfileDir -use_matpltolib = False +use_matplotlib = False try: import matplotlib - use_matpltolib = True + use_matplotlib = True except Exception: pass @@ -934,7 +934,7 @@ class IPythonDirective(Directive): # EmbeddedSphinxShell is created, its interactive shell member # is the same for each instance. - if mplbackend and 'matplotlib.backends' not in sys.modules and use_matpltolib: + if mplbackend and 'matplotlib.backends' not in sys.modules and use_matplotlib: import matplotlib matplotlib.use(mplbackend) @@ -1065,7 +1065,7 @@ def setup(app): # If the user sets this config value to `None`, then EmbeddedSphinxShell's # __init__ method will treat it as []. execlines = ['import numpy as np'] - if use_matpltolib: + if use_matplotlib: execlines.append('import matplotlib.pyplot as plt') app.add_config_value('ipython_execlines', execlines, 'env') diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py index 2f416d1..e6b4f57 100644 --- a/IPython/terminal/pt_inputhooks/wx.py +++ b/IPython/terminal/pt_inputhooks/wx.py @@ -1,4 +1,4 @@ -"""Enable wxPython to be used interacively in prompt_toolkit +"""Enable wxPython to be used interactively in prompt_toolkit """ import sys diff --git a/IPython/utils/tests/test_tokenutil.py b/IPython/utils/tests/test_tokenutil.py index 4ffe7af..0e69d5f 100644 --- a/IPython/utils/tests/test_tokenutil.py +++ b/IPython/utils/tests/test_tokenutil.py @@ -120,7 +120,7 @@ def test_line_at_cursor(): nt.assert_equal(line, "pri") nt.assert_equal(offset, 4) -def test_muliline_statement(): +def test_multiline_statement(): cell = """a = (1, 3) diff --git a/docs/source/whatsnew/version0.10.rst b/docs/source/whatsnew/version0.10.rst index 6073216..1ffbaa2 100644 --- a/docs/source/whatsnew/version0.10.rst +++ b/docs/source/whatsnew/version0.10.rst @@ -77,7 +77,7 @@ Highlights of this release: in remote tasks, as well as providing better control for remote task IDs. - New IPython Sphinx directive contributed by John Hunter. You can use this - directive to mark blocks in reSructuredText documents as containing IPython + directive to mark blocks in reStructuredText documents as containing IPython syntax (including figures) and the will be executed during the build: .. sourcecode:: ipython diff --git a/docs/source/whatsnew/version0.11.rst b/docs/source/whatsnew/version0.11.rst index a557c31..05d6447 100644 --- a/docs/source/whatsnew/version0.11.rst +++ b/docs/source/whatsnew/version0.11.rst @@ -155,7 +155,7 @@ cycle from several institutions: .. __: http://modular.math.washington.edu/grants/compmath09 - Microsoft's team working on `Python Tools for Visual Studio`__ developed the - integraton of IPython into the Python plugin for Visual Studio 2010. + integratron of IPython into the Python plugin for Visual Studio 2010. .. __: http://pytools.codeplex.com diff --git a/docs/source/whatsnew/version0.9.rst b/docs/source/whatsnew/version0.9.rst index d0f45eb..81ebba1 100644 --- a/docs/source/whatsnew/version0.9.rst +++ b/docs/source/whatsnew/version0.9.rst @@ -33,7 +33,7 @@ New features * A new, still experimental but highly functional, WX shell by Gael Varoquaux. This work was sponsored by Enthought, and while it's still very new, it is - based on a more cleanly organized arhictecture of the various IPython + based on a more cleanly organized architecture of the various IPython components. We will continue to develop this over the next few releases as a model for GUI components that use IPython. @@ -69,7 +69,7 @@ New features method that has the same syntax as the built-in `map`. We have also defined a `mapper` factory interface that creates objects that implement :class:`IPython.kernel.mapper.IMapper` for different controllers. Both the - multiengine and task controller now have mapping capabilties. + multiengine and task controller now have mapping capabilities. * The parallel function capabilities have been reworks. The major changes are that i) there is now an `@parallel` magic that creates parallel functions, diff --git a/docs/source/whatsnew/version2.0.rst b/docs/source/whatsnew/version2.0.rst index e379308..abdbaed 100644 --- a/docs/source/whatsnew/version2.0.rst +++ b/docs/source/whatsnew/version2.0.rst @@ -341,7 +341,7 @@ Backwards incompatible changes Python versions are now 2.7 and 3.3. * The Transformer classes have been renamed to Preprocessor in nbconvert and their ``call`` methods have been renamed to ``preprocess``. -* The ``call`` methods of nbconvert post-processsors have been renamed to +* The ``call`` methods of nbconvert post-processors have been renamed to ``postprocess``. * The module ``IPython.core.fakemodule`` has been removed. diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst index 760edf2..47491b6 100644 --- a/docs/source/whatsnew/version7.rst +++ b/docs/source/whatsnew/version7.rst @@ -142,7 +142,7 @@ preserves prior behavior of normalizing the audio to the maximum possible range. Setting to `False` disables normalization. -Miscelanious +Miscellaneous ------------ - Fix improper acceptation of ``return`` outside of functions. :ghpull:`11641`. diff --git a/setupext/__init__.py b/setupext/__init__.py index c8ce037..3933cb5 100644 --- a/setupext/__init__.py +++ b/setupext/__init__.py @@ -1,3 +1,3 @@ -# load extended setup modules for distuils +# load extended setup modules for distutils from .install_data_ext import install_data_ext