##// END OF EJS Templates
Merge pull request #10983 from luzpaz/misc-typos...
Thomas Kluyver -
r24133:db2a0da2 merge
parent child Browse files
Show More
@@ -136,7 +136,7 b' class CachingCompiler(codeop.Compile):'
136 136 def check_linecache_ipython(*args):
137 137 """Call linecache.checkcache() safely protecting our cached values.
138 138 """
139 # First call the orignal checkcache as intended
139 # First call the original checkcache as intended
140 140 linecache._checkcache_ori(*args)
141 141 # Then, update back the cache with our data, so that tracebacks related
142 142 # to our compiled codes can be produced.
@@ -2005,7 +2005,7 b' class IPCompleter(Completer):'
2005 2005 # FIXME: we should extend our api to return a dict with completions for
2006 2006 # different types of objects. The rlcomplete() method could then
2007 2007 # simply collapse the dict into a list for readline, but we'd have
2008 # richer completion semantics in other evironments.
2008 # richer completion semantics in other environments.
2009 2009 completions = ()
2010 2010 if self.use_jedi:
2011 2011 if not full_text:
@@ -179,7 +179,7 b' class HistoryAccessor(HistoryAccessorBase):'
179 179 help="""Options for configuring the SQLite connection
180 180
181 181 These options are passed as keyword args to sqlite3.connect
182 when establishing database conenctions.
182 when establishing database connections.
183 183 """
184 184 ).tag(config=True)
185 185
@@ -53,7 +53,7 b' $""", re.VERBOSE)'
53 53
54 54 def extract_code_ranges(ranges_str):
55 55 """Turn a string of range for %%load into 2-tuples of (start, stop)
56 ready to use as a slice of the content splitted by lines.
56 ready to use as a slice of the content split by lines.
57 57
58 58 Examples
59 59 --------
@@ -114,7 +114,7 b' class LineInfo(object):'
114 114
115 115 self.pre_char = self.pre.strip()
116 116 if self.pre_char:
117 self.pre_whitespace = '' # No whitespace allowd before esc chars
117 self.pre_whitespace = '' # No whitespace allowed before esc chars
118 118 else:
119 119 self.pre_whitespace = self.pre
120 120
@@ -367,8 +367,8 b' def test_greedy_completions():'
367 367 """
368 368 Test the capability of the Greedy completer.
369 369
370 Most of the test here do not really show off the greedy completer, for proof
371 each of the text bellow now pass with Jedi. The greedy completer is capable of more.
370 Most of the test here does not really show off the greedy completer, for proof
371 each of the text below now pass with Jedi. The greedy completer is capable of more.
372 372
373 373 See the :any:`test_dict_key_completion_contexts`
374 374
@@ -424,7 +424,7 b' class FileLinks(FileLink):'
424 424 raise ValueError("Cannot display a file using FileLinks. "
425 425 "Use FileLink to display '%s'." % path)
426 426 self.included_suffixes = included_suffixes
427 # remove trailing slashs for more consistent output formatting
427 # remove trailing slashes for more consistent output formatting
428 428 path = path.rstrip('/')
429 429
430 430 self.path = path
@@ -29,7 +29,7 b' def install_editor(template, wait=False):'
29 29 template : basestring
30 30 run_template acts as a template for how your editor is invoked by
31 31 the shell. It should contain '{filename}', which will be replaced on
32 invokation with the file name, and '{line}', $line by line number
32 invocation with the file name, and '{line}', $line by line number
33 33 (or 0) to invoke the file with.
34 34 wait : bool
35 35 If `wait` is true, wait until the user presses enter before returning,
@@ -112,7 +112,7 b' def glut_close():'
112 112 glutMainLoopEvent()
113 113
114 114 def glut_int_handler(signum, frame):
115 # Catch sigint and print the defautl message
115 # Catch sigint and print the default message
116 116 signal.signal(signal.SIGINT, signal.default_int_handler)
117 117 print('\nKeyboardInterrupt')
118 118 # Need to reprint the prompt at this stage
@@ -114,7 +114,7 b' To Do'
114 114 Authors
115 115 -------
116 116
117 - John D Hunter: orignal author.
117 - John D Hunter: original author.
118 118 - Fernando Perez: refactoring, documentation, cleanups, port to 0.11.
119 119 - VáclavŠmilauer <eudoxos-AT-arcig.cz>: Prompt generalizations.
120 120 - Skipper Seabold, refactoring, cleanups, pure python addition
@@ -250,7 +250,7 b" def ipexec_validate(fname, expected_out, expected_err='',"
250 250 out, err = ipexec(fname, options, commands)
251 251 #print 'OUT', out # dbg
252 252 #print 'ERR', err # dbg
253 # If there are any errors, we must check those befor stdout, as they may be
253 # If there are any errors, we must check those before stdout, as they may be
254 254 # more informative than simply having an empty stdout.
255 255 if err:
256 256 if expected_err:
@@ -64,7 +64,7 b' def test_columnize():'
64 64
65 65
66 66 def test_columnize_random():
67 """Test with random input to hopfully catch edge case """
67 """Test with random input to hopefully catch edge case """
68 68 for row_first in [True, False]:
69 69 for nitems in [random.randint(2,70) for i in range(2,20)]:
70 70 displaywidth = random.randint(20,200)
@@ -297,7 +297,7 b' def _get_normal_name(orig_enc):'
297 297 def detect_encoding(readline):
298 298 """
299 299 The detect_encoding() function is used to detect the encoding that should
300 be used to decode a Python source file. It requires one argment, readline,
300 be used to decode a Python source file. It requires one argument, readline,
301 301 in the same way as the tokenize() generator.
302 302
303 303 It will call readline a maximum of twice, and return the encoding used
@@ -383,7 +383,7 b' def open(filename):'
383 383
384 384 def tokenize(readline):
385 385 """
386 The tokenize() generator requires one argment, readline, which
386 The tokenize() generator requires one argument, readline, which
387 387 must be a callable object which provides the same interface as the
388 388 readline() method of built-in file objects. Each call to the function
389 389 should return one line of input as bytes. Alternately, readline
@@ -243,7 +243,7 b' behavior is to likely to insert a new line. If the current code is a simple'
243 243 statement like `ord('*')`, then the right behavior is likely to execute. Though
244 244 the exact desired semantics often varies from users to users.
245 245
246 As the exact behavior of :kbd:`Enter` is is ambiguous, it has been special cased
246 As the exact behavior of :kbd:`Enter` is ambiguous, it has been special cased
247 247 to allow users to completely configure the behavior they like. Hence you can
248 248 have enter always execute code. If you prefer fancier behavior, you need to get
249 249 your hands dirty and read the ``prompt_toolkit`` and IPython documentation
@@ -51,7 +51,7 b' Kernels for different environments'
51 51 If you want to have multiple IPython kernels for different virtualenvs or conda
52 52 environments, you will need to specify unique names for the kernelspecs.
53 53
54 Make sure you have ipykernel installed in your environement. If you are using
54 Make sure you have ipykernel installed in your environment. If you are using
55 55 ``pip`` to install ``ipykernel`` in a conda env, make sure ``pip`` is
56 56 installed:
57 57
@@ -800,7 +800,7 b' Pull Requests (687):'
800 800 * :ghpull:`4768`: Qt console: Fix _prompt_pos accounting on timer flush output.
801 801 * :ghpull:`4727`: Remove Nbconvert template loading magic
802 802 * :ghpull:`4763`: Set numpydoc options to produce fewer Sphinx warnings.
803 * :ghpull:`4770`: alway define aliases, even if empty
803 * :ghpull:`4770`: always define aliases, even if empty
804 804 * :ghpull:`4766`: add `python -m` entry points for everything
805 805 * :ghpull:`4767`: remove manpages for irunner, iplogger
806 806 * :ghpull:`4751`: Added --post-serve explanation into the nbconvert docs.
@@ -1351,7 +1351,7 b''
1351 1351 "cell_type": "markdown",
1352 1352 "metadata": {},
1353 1353 "source": [
1354 "Don't foget to exit your debugging session. Raw input can of course be use to ask for user input:"
1354 "Don't forget to exit your debugging session. Raw input can of course be used to ask for user input:"
1355 1355 ]
1356 1356 },
1357 1357 {
@@ -2483,7 +2483,7 b''
2483 2483 "cell_type": "markdown",
2484 2484 "metadata": {},
2485 2485 "source": [
2486 "We can connect automatically a Qt Console to the currently running kernel with the `%qtconsole` magic, or by typing `ipython console --existing <kernel-UUID>` in any terminal:"
2486 "We can automatically connect a Qt Console to the currently running kernel with the `%qtconsole` magic, or by typing `ipython console --existing <kernel-UUID>` in any terminal:"
2487 2487 ]
2488 2488 },
2489 2489 {
@@ -161,7 +161,7 b" def should_backport(labels=None, milestone=None, project='ipython/ipython'):"
161 161 if __name__ == '__main__':
162 162 project = 'ipython/ipython'
163 163
164 print("DEPRECATE: backport_pr.py is deprecated and is is now recommended"
164 print("DEPRECATE: backport_pr.py is deprecated and it is now recommended"
165 165 "to install `ghpro` from PyPI.", file=sys.stderr)
166 166
167 167 args = list(sys.argv)
@@ -45,7 +45,7 b' lines = [line_to_tuple(line) for line in lines]'
45 45 print('Filtering out characters that are not valid Python 3 identifiers')
46 46
47 47 def test_ident(i):
48 """Is the unicode string valid in a Python 3 identifer."""
48 """Is the unicode string valid in a Python 3 identifier."""
49 49 # Some characters are not valid at the start of a name, but we still want to
50 50 # include them. So prefix with 'a', which is valid at the start.
51 51 return ('a' + i).isidentifier()
@@ -110,7 +110,7 b' def report(issues, show_urls=False):'
110 110
111 111 if __name__ == "__main__":
112 112
113 print("DEPRECATE: backport_pr.py is deprecated and is is now recommended"
113 print("DEPRECATE: backport_pr.py is deprecated and it is now recommended"
114 114 "to install `ghpro` from PyPI.", file=sys.stderr)
115 115
116 116
@@ -75,7 +75,7 b''
75 75 "\n",
76 76 "```\n",
77 77 "def some_other_code():\n",
78 " return 'bewtween_backticks'\n",
78 " return 'between_backticks'\n",
79 79 "```"
80 80 ]
81 81 },
@@ -83,7 +83,7 b''
83 83 "cell_type": "markdown",
84 84 "metadata": {},
85 85 "source": [
86 "You can look at different level of nested unorderd list \n",
86 "You can look at different level of nested unordered list \n",
87 87 "\n",
88 88 "- level 1\n",
89 89 " - level 2\n",
General Comments 0
You need to be logged in to leave comments. Login now