diff --git a/IPython/core/completer.py b/IPython/core/completer.py index 7d6cf27..0d54dc7 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -360,7 +360,7 @@ class Completion: need user facing information. - Which range should be replaced replaced by what. - - Some metadata (like completion type), or meta informations to displayed to + - Some metadata (like completion type), or meta information to displayed to the use user. For debugging purpose we can also store the origin of the completion (``jedi``, @@ -1873,7 +1873,7 @@ class IPCompleter(Completer): start_offset = before.rfind(matched_text) # TODO: - # Supress this, right now just for debug. + # Suppress this, right now just for debug. if jedi_matches and matches and self.debug: yield Completion(start=start_offset, end=offset, text='--jedi/ipython--', _origin='debug', type='none', signature='') diff --git a/IPython/core/hooks.py b/IPython/core/hooks.py index a30fa42..7cf250a 100644 --- a/IPython/core/hooks.py +++ b/IPython/core/hooks.py @@ -101,7 +101,7 @@ def fix_error_editor(self,filename,linenum,column,msg): `fix_error_editor` is deprecated as of IPython 6.0 and will be removed in future versions. It appears to be used only for automatically fixing syntax error that has been broken for a few years and has thus been removed. If you -happend to use this function and still need it please make your voice heard on +happened to use this function and still need it please make your voice heard on the mailing list ipython-dev@python.org , or on the GitHub Issue tracker: https://github.com/ipython/ipython/issues/9649 """, UserWarning) diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index e094a11..8b5e0ca 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -1899,7 +1899,7 @@ class InteractiveShell(SingletonConfigurable): # Not the format we expect; leave it alone pass - # If the error occured when executing compiled code, we should provide full stacktrace. + # If the error occurred when executing compiled code, we should provide full stacktrace. elist = traceback.extract_tb(last_traceback) if running_compiled_code else [] stb = self.SyntaxTB.structured_traceback(etype, value, elist) self._showtraceback(etype, value, stb) diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py index 5451139..7eae5a0 100644 --- a/IPython/core/magics/basic.py +++ b/IPython/core/magics/basic.py @@ -406,7 +406,7 @@ Currently the magic system has the following functions:""", The Python package manager (pip) can only be used from outside of IPython. Please reissue the `pip` command in a separate terminal or command prompt. - See the Python documentation for more informations on how to install packages: + See the Python documentation for more information on how to install packages: https://docs.python.org/3/installing/'''.format(args=args))) diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py index 9840b11..0c82b7f 100644 --- a/IPython/core/magics/code.py +++ b/IPython/core/magics/code.py @@ -369,14 +369,14 @@ class CodeMagics(Magics): l = len(contents) - # 200 000 is ~ 2500 full 80 caracter lines + # 200 000 is ~ 2500 full 80 character lines # so in average, more than 5000 lines if l > 200000 and 'y' not in opts: try: ans = self.shell.ask_yes_no(("The text you're trying to load seems pretty big"\ " (%d characters). Continue (y/[N]) ?" % l), default='n' ) except StdinNotImplementedError: - #asume yes if raw input not implemented + #assume yes if raw input not implemented ans = True if ans is False : diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py index fc1ecf5..4f45345 100644 --- a/IPython/core/oinspect.py +++ b/IPython/core/oinspect.py @@ -591,9 +591,9 @@ class Inspector(Colorable): Name of the variable pointing to `obj`. formatter: callable info: - already computed informations + already computed information detail_level: integer - Granularity of detail level, if set to 1, give more informations. + Granularity of detail level, if set to 1, give more information. """ info = self._info(obj, oname=oname, info=info, detail_level=detail_level) @@ -679,7 +679,7 @@ class Inspector(Colorable): The formatter is a callable that takes a string as an input and returns either a formatted string or a mime type bundle - in the form of a dictionnary. + in the form of a dictionary. Although the support of custom formatter returning a string instead of a mime type bundle is deprecated. diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py index c3109c7..255d42a 100644 --- a/IPython/core/prefilter.py +++ b/IPython/core/prefilter.py @@ -43,7 +43,7 @@ re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$') # particular, all binary operators should be excluded, so that if foo is # callable, foo OP bar doesn't become foo(OP bar), which is invalid. The # characters '!=()' don't need to be checked for, as the checkPythonChars -# routine explicitely does so, to catch direct calls and rebindings of +# routine explicitly does so, to catch direct calls and rebindings of # existing names. # Warning: the '-' HAS TO BE AT THE END of the first group, otherwise diff --git a/IPython/core/tests/test_displayhook.py b/IPython/core/tests/test_displayhook.py index 82b8298..7887f77 100644 --- a/IPython/core/tests/test_displayhook.py +++ b/IPython/core/tests/test_displayhook.py @@ -56,7 +56,7 @@ def test_underscore_no_overrite_builtins(): def test_interactivehooks_ast_modes(): """ - Test that ast nodes can be triggerd with different modes + Test that ast nodes can be triggered with different modes """ saved_mode = ip.ast_node_interactivity ip.ast_node_interactivity = 'last_expr_or_assign' @@ -83,7 +83,7 @@ def test_interactivehooks_ast_modes(): def test_interactivehooks_ast_modes_semi_supress(): """ - Test that ast nodes can be triggerd with different modes and supressed + Test that ast nodes can be triggered with different modes and suppressed by semicolon """ saved_mode = ip.ast_node_interactivity diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py index f64d2a6..5225ec3 100644 --- a/IPython/core/tests/test_magic.py +++ b/IPython/core/tests/test_magic.py @@ -106,7 +106,7 @@ def test_magic_error_status(): def test_config(): """ test that config magic does not raise can happen if Configurable init is moved too early into - Magics.__init__ as then a Config object will be registerd as a + Magics.__init__ as then a Config object will be registered as a magic. """ ## should not raise. @@ -587,7 +587,7 @@ def test_timeit_special_syntax(): def test_timeit_return(): """ - test wether timeit -o return object + test whether timeit -o return object """ res = _ip.run_line_magic('timeit','-n10 -r10 -o 1') diff --git a/IPython/core/usage.py b/IPython/core/usage.py index 2a98a6e..881635b 100644 --- a/IPython/core/usage.py +++ b/IPython/core/usage.py @@ -298,7 +298,7 @@ System commands: !cp a.txt b/ : System command escape, calls os.system() cp a.txt b/ : after %rehashx, most system commands work without ! cp ${f}.txt $bar : Variable expansion in magics and system commands -files = !ls /usr : Capture sytem command output +files = !ls /usr : Capture system command output files.s, files.l, files.n: "a b c", ['a','b','c'], 'a\nb\nc' History: diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py index 623e554..586b2be 100644 --- a/IPython/lib/deepreload.py +++ b/IPython/lib/deepreload.py @@ -273,7 +273,7 @@ def deep_reload_hook(m): """Replacement for reload().""" # Hardcode this one as it would raise a NotImplemeentedError from the # bowels of Python and screw up the import machinery after. - # unlike other imports the `exclude` list aleady in place is not enough. + # unlike other imports the `exclude` list already in place is not enough. if m is types: return m diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py index 2c6282e..26e4fad 100644 --- a/IPython/lib/demo.py +++ b/IPython/lib/demo.py @@ -231,7 +231,7 @@ class Demo(object): value. - format_rst(False): a bool to enable comments and doc strings - formating with pygments rst lexer + formatting with pygments rst lexer - formatter('terminal'): a string of pygments formatter name to be used. Useful values for terminals: terminal, terminal256, diff --git a/IPython/lib/display.py b/IPython/lib/display.py index 34bbae7..93547b0 100644 --- a/IPython/lib/display.py +++ b/IPython/lib/display.py @@ -508,7 +508,7 @@ class FileLinks(FileLink): # Working on a platform where the path separator is "\", so # must convert these to "/" for generating a URI def fp_cleaner(fp): - # Replace all occurences of backslash ("\") with a forward + # Replace all occurrences of backslash ("\") with a forward # slash ("/") - this is necessary on windows when a path is # provided as input, but we must link to a URI return fp.replace('\\','/') diff --git a/IPython/lib/editorhooks.py b/IPython/lib/editorhooks.py index 905eabe..b203e21 100644 --- a/IPython/lib/editorhooks.py +++ b/IPython/lib/editorhooks.py @@ -96,7 +96,7 @@ def idle(exe=u'idle'): import idlelib p = os.path.dirname(idlelib.__filename__) # i'm not sure if this actually works. Is this idle.py script - # guarenteed to be executable? + # guaranteed to be executable? exe = os.path.join(p, 'idle.py') install_editor(exe + u' {filename}') diff --git a/IPython/terminal/pt_inputhooks/tk.py b/IPython/terminal/pt_inputhooks/tk.py index 7153ca2..2715505 100644 --- a/IPython/terminal/pt_inputhooks/tk.py +++ b/IPython/terminal/pt_inputhooks/tk.py @@ -34,7 +34,7 @@ Wrapper around the eventloop that gives some time to the Tkinter GUI to process events when it's loaded and while we are waiting for input at the REPL. This way we don't block the UI of for instance ``turtle`` and other Tk libraries. -(Normally Tkinter registeres it's callbacks in ``PyOS_InputHook`` to integrate +(Normally Tkinter registers it's callbacks in ``PyOS_InputHook`` to integrate in readline. ``prompt-toolkit`` doesn't understand that input hook, but this will fix it for Tk.) """ diff --git a/IPython/testing/ipunittest.py b/IPython/testing/ipunittest.py index 2aeaab0..cb5060f 100644 --- a/IPython/testing/ipunittest.py +++ b/IPython/testing/ipunittest.py @@ -55,7 +55,7 @@ class IPython2PythonConverter(object): """Convert IPython 'syntax' to valid Python. Eventually this code may grow to be the full IPython syntax conversion - implementation, but for now it only does prompt convertion.""" + implementation, but for now it only does prompt conversion.""" def __init__(self): self.rps1 = re.compile(r'In\ \[\d+\]: ') diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py index 115d412..fb17e4c 100644 --- a/IPython/utils/_process_win32.py +++ b/IPython/utils/_process_win32.py @@ -166,7 +166,7 @@ try: """Split a command line's arguments in a shell-like manner. This is a special version for windows that use a ctypes call to CommandLineToArgvW - to do the argv splitting. The posix paramter is ignored. + to do the argv splitting. The posix parameter is ignored. If strict=False, process_common.arg_split(...strict=False) is used instead. """ diff --git a/IPython/utils/path.py b/IPython/utils/path.py index a766cbb..08806c2 100644 --- a/IPython/utils/path.py +++ b/IPython/utils/path.py @@ -115,7 +115,7 @@ def filefind(filename, path_dirs=None): """Find a file by looking through a sequence of paths. This iterates through a sequence of paths looking for a file and returns - the full, absolute path of the first occurence of the file. If no set of + the full, absolute path of the first occurrence of the file. If no set of path dirs is given, the filename is tested as is, after running through :func:`expandvars` and :func:`expanduser`. Thus a simple call:: diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py index e40f8bb..cca2384 100644 --- a/IPython/utils/tests/test_path.py +++ b/IPython/utils/tests/test_path.py @@ -192,7 +192,7 @@ def test_get_xdg_dir_0(): @with_environment def test_get_xdg_dir_1(): - """test_get_xdg_dir_1, check nonexistant xdg_dir""" + """test_get_xdg_dir_1, check nonexistent xdg_dir""" reload(path) path.get_home_dir = lambda : HOME_TEST_DIR os.name = "posix" diff --git a/IPython/utils/text.py b/IPython/utils/text.py index a94e0e1..397209d 100644 --- a/IPython/utils/text.py +++ b/IPython/utils/text.py @@ -667,7 +667,7 @@ def compute_item_matrix(items, row_first=False, empty=None, *args, **kwargs) : separator_size : int (default=2) How much caracters will be used as a separation between each columns. displaywidth : int (default=80) - The width of the area onto wich the columns should enter + The width of the area onto which the columns should enter Returns ------- @@ -675,7 +675,7 @@ def compute_item_matrix(items, row_first=False, empty=None, *args, **kwargs) : strings_matrix nested list of string, the outer most list contains as many list as - rows, the innermost lists have each as many element as colums. If the + rows, the innermost lists have each as many element as columns. If the total number of elements in `items` does not equal the product of rows*columns, the last element of some lists are filled with `None`. diff --git a/docs/source/install/kernel_install.rst b/docs/source/install/kernel_install.rst index 5bc3dae..3949f9a 100644 --- a/docs/source/install/kernel_install.rst +++ b/docs/source/install/kernel_install.rst @@ -86,7 +86,7 @@ Using virtualenv or conda envs, you can make your IPython kernel in one env avai /path/to/kernel/env/bin/python -m ipykernel install --prefix=/path/to/jupyter/env --name 'python-my-env' -Note that this command will create a new configuration for the kernel in one of the prefered location (see ``jupyter --paths`` command for more details): +Note that this command will create a new configuration for the kernel in one of the preferred location (see ``jupyter --paths`` command for more details): * system-wide (e.g. /usr/local/share), * in Jupyter's env (sys.prefix/share), diff --git a/docs/source/whatsnew/github-stats-0.11.rst b/docs/source/whatsnew/github-stats-0.11.rst index ad6e456..52418a6 100644 --- a/docs/source/whatsnew/github-stats-0.11.rst +++ b/docs/source/whatsnew/github-stats-0.11.rst @@ -34,7 +34,7 @@ Pull requests (226): * `574 `_: Getcwdu * `565 `_: don't move old config files, keep nagging the user * `575 `_: Added more docstrings to IPython.zmq.session. -* `567 `_: fix trailing whitespace from reseting indentation +* `567 `_: fix trailing whitespace from resetting indentation * `564 `_: Command line args in docs * `560 `_: reorder qt support in kernel * `561 `_: command-line suggestions @@ -445,7 +445,7 @@ Regular issues (285): * `46 `_: Input to %timeit is not preparsed * `285 `_: ipcluster local -n 4 fails * `205 `_: In the Qt console, Tab should insert 4 spaces when not completing -* `145 `_: Bug on MSW sytems: idle can not be set as default IPython editor. Fix Suggested. +* `145 `_: Bug on MSW systems: idle can not be set as default IPython editor. Fix Suggested. * `77 `_: ipython oops in cygwin * `121 `_: If plot windows are closed via window controls, no more plotting is possible. * `111 `_: Iterator version of TaskClient.map() that returns results as they become available @@ -494,7 +494,7 @@ Regular issues (285): * `161 `_: make ipythonqt exit without dialog when exit() is called * `263 `_: [ipython + numpy] Some test errors * `256 `_: reset docstring ipython 0.10 -* `258 `_: allow caching to avoid matplotlib object referrences +* `258 `_: allow caching to avoid matplotlib object references * `248 `_: Can't open and read files after upgrade from 0.10 to 0.10.0 * `247 `_: ipython + Stackless * `245 `_: Magic save and macro missing newlines, line ranges don't match prompt numbers. diff --git a/docs/source/whatsnew/github-stats-0.12.rst b/docs/source/whatsnew/github-stats-0.12.rst index 05d139a..8999081 100644 --- a/docs/source/whatsnew/github-stats-0.12.rst +++ b/docs/source/whatsnew/github-stats-0.12.rst @@ -284,7 +284,7 @@ Pull requests (257): * `798 `_: pexpect & Python 3 * `804 `_: Magic 'range' crash if greater than len(input_hist) * `821 `_: update tornado dependency to 2.1 -* `807 `_: Faciliate ssh tunnel sharing by announcing ports +* `807 `_: Facilitate ssh tunnel sharing by announcing ports * `795 `_: Add cluster-id for multiple cluster instances per profile * `742 `_: Glut * `668 `_: Greedy completer diff --git a/docs/source/whatsnew/github-stats-1.0.rst b/docs/source/whatsnew/github-stats-1.0.rst index 7f0da0b..db34dea 100644 --- a/docs/source/whatsnew/github-stats-1.0.rst +++ b/docs/source/whatsnew/github-stats-1.0.rst @@ -581,7 +581,7 @@ Pull Requests (793): * :ghpull:`3575`: tweak `run -d` message to 'continue execution' * :ghpull:`3569`: add PYTHONSTARTUP to startup files * :ghpull:`3567`: Trigger a single event on js app initilized -* :ghpull:`3565`: style.min.css shoudl always exist... +* :ghpull:`3565`: style.min.css should always exist... * :ghpull:`3531`: allow markdown in heading cells * :ghpull:`3577`: Simplify codemirror ipython-mode * :ghpull:`3495`: Simplified regexp, and suggestions for clearer regexps. @@ -666,7 +666,7 @@ Pull Requests (793): * :ghpull:`3373`: make cookie_secret configurable * :ghpull:`3307`: switch default ws_url logic to js side * :ghpull:`3392`: Restore anchor link on h2-h6 -* :ghpull:`3369`: Use different treshold for (auto)scroll in output +* :ghpull:`3369`: Use different threshold for (auto)scroll in output * :ghpull:`3370`: normalize unicode notebook filenames * :ghpull:`3372`: base default cookie name on request host+port * :ghpull:`3378`: disable CodeMirror drag/drop on Safari @@ -1476,7 +1476,7 @@ Issues (691): * :ghissue:`3374`: ipython qtconsole does not display the prompt on OSX * :ghissue:`3380`: simple call to kernel * :ghissue:`3379`: TaskRecord key 'started' not set -* :ghissue:`3241`: notebook conection time out +* :ghissue:`3241`: notebook connection time out * :ghissue:`3334`: magic interpreter interpretes non magic commands? * :ghissue:`3326`: python3.3: Type error when launching SGE cluster in IPython notebook * :ghissue:`3349`: pip3 doesn't run 2to3? @@ -1802,7 +1802,7 @@ Issues (691): * :ghissue:`2351`: Multiple Notebook Apps: cookies not port specific, clash with each other * :ghissue:`2350`: running unittest from qtconsole prints output to terminal * :ghissue:`2303`: remote tracebacks broken since 952d0d6 (PR #2223) -* :ghissue:`2330`: qtconsole does not hightlight tab-completion suggestion with custom stylesheet +* :ghissue:`2330`: qtconsole does not highlight tab-completion suggestion with custom stylesheet * :ghissue:`2325`: Parsing Tex formula fails in Notebook * :ghissue:`2324`: Parsing Tex formula fails * :ghissue:`1474`: Add argument to `run -n` for custom namespace diff --git a/docs/source/whatsnew/github-stats-2.0.rst b/docs/source/whatsnew/github-stats-2.0.rst index 6eb0e05..4fe6f19 100644 --- a/docs/source/whatsnew/github-stats-2.0.rst +++ b/docs/source/whatsnew/github-stats-2.0.rst @@ -1422,7 +1422,7 @@ Issues (434): * :ghissue:`3402`: Feature Request: Save As (latex, html,..etc) as a menu option in Notebook rather than explicit need to invoke nbconvert * :ghissue:`3224`: Revisit layout of notebook area * :ghissue:`2746`: rerunning a cell with long output (exception) scrolls to much (html notebook) -* :ghissue:`2667`: can't save opened notebook if accidently delete the notebook in the dashboard +* :ghissue:`2667`: can't save opened notebook if accidentally delete the notebook in the dashboard * :ghissue:`3026`: Reporting errors from _repr__ methods * :ghissue:`1844`: Notebook does not exist and permalinks * :ghissue:`2450`: [closed PR] Prevent jumping of window to input when output is clicked. diff --git a/docs/source/whatsnew/version0.10.rst b/docs/source/whatsnew/version0.10.rst index bb0f14e..6073216 100644 --- a/docs/source/whatsnew/version0.10.rst +++ b/docs/source/whatsnew/version0.10.rst @@ -34,7 +34,7 @@ Highlights of this release: (such as a linux text console without X11). For this release we merged 24 commits, contributed by the following people -(please let us know if we ommitted your name and we'll gladly fix this in the +(please let us know if we omitted your name and we'll gladly fix this in the notes for the future): * Fernando Perez diff --git a/docs/source/whatsnew/version3_widget_migration.rst b/docs/source/whatsnew/version3_widget_migration.rst index 08856ee..1daeb7e 100644 --- a/docs/source/whatsnew/version3_widget_migration.rst +++ b/docs/source/whatsnew/version3_widget_migration.rst @@ -190,7 +190,7 @@ Smaller Changes (`#6990 `__). - A warning was added that shows on widget import because it's expected that the API will change again by IPython 4.0. This warning can be - supressed (`#7107 `__, + suppressed (`#7107 `__, `#7200 `__, `#7201 `__, `#7204 `__). diff --git a/docs/source/whatsnew/version5.rst b/docs/source/whatsnew/version5.rst index 8a6359e..5f8d046 100644 --- a/docs/source/whatsnew/version5.rst +++ b/docs/source/whatsnew/version5.rst @@ -87,7 +87,7 @@ Define ``_repr_mimebundle_`` Object can now define `_repr_mimebundle_` in place of multiple `_repr_*_` methods and return a full mimebundle. This greatly simplify many implementation and allow to publish custom mimetypes (like geojson, plotly, dataframes....). -See the ``Cutom Display Logic`` example notebook for more informations. +See the ``Custom Display Logic`` example notebook for more information. Execution Heuristics -------------------- diff --git a/examples/IPython Kernel/Custom Display Logic.ipynb b/examples/IPython Kernel/Custom Display Logic.ipynb index dd879de..fa9762e 100644 --- a/examples/IPython Kernel/Custom Display Logic.ipynb +++ b/examples/IPython Kernel/Custom Display Logic.ipynb @@ -739,7 +739,7 @@ " \n", " def _repr_mimebundle_(self, include, exclude, **kwargs):\n", " \"\"\"\n", - " repr_mimebundle shoudl accept include, exclude and **kwargs\n", + " repr_mimebundle should accept include, exclude and **kwargs\n", " \"\"\"\n", " if self._png_data is None:\n", " self._png_data = self._figure_data('png')\n", @@ -777,7 +777,7 @@ } ], "source": [ - "# that is deffinitively wrong as it shoudl show the PNG. \n", + "# that is deffinitively wrong as it should show the PNG. \n", "display(Gaussian())" ] }, diff --git a/examples/IPython Kernel/Plotting in the Notebook.ipynb b/examples/IPython Kernel/Plotting in the Notebook.ipynb index 8d153f7..645c2d8 100644 --- a/examples/IPython Kernel/Plotting in the Notebook.ipynb +++ b/examples/IPython Kernel/Plotting in the Notebook.ipynb @@ -2602,7 +2602,7 @@ " // Register the callback with on_msg.\n", " comm.on_msg(function(msg) {\n", " //console.log('receiving', msg['content']['data'], msg);\n", - " // Pass the mpl event to the overriden (by mpl) onmessage function.\n", + " // Pass the mpl event to the overridden (by mpl) onmessage function.\n", " ws.onmessage(msg['content']['data'])\n", " });\n", " return ws;\n", diff --git a/tools/gen_latex_symbols.py b/tools/gen_latex_symbols.py index 9a2421f..b456c5d 100644 --- a/tools/gen_latex_symbols.py +++ b/tools/gen_latex_symbols.py @@ -3,7 +3,7 @@ # This script autogenerates `IPython.core.latex_symbols.py`, which contains a # single dict , named `latex_symbols`. The keys in this dict are latex symbols, # such as `\\alpha` and the values in the dict are the unicode equivalents for -# those. Most importantly, only unicode symbols that are valid identifers in +# those. Most importantly, only unicode symbols that are valid identifiers in # Python 3 are included. # diff --git a/tools/git-mpr.py b/tools/git-mpr.py index 4d8423e..ac5e2b8 100755 --- a/tools/git-mpr.py +++ b/tools/git-mpr.py @@ -23,7 +23,7 @@ def merge_branch(repo, branch ): If something does not goes smoothly, merge is aborted - Returns True if merge sucessfull, False otherwise + Returns True if merge successful, False otherwise """ # Delete the branch first try :