Skip to content

spelling fixes #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Apr 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ New features:
* #354: Edit config file from within bpython.
* #382: Partial support for pasting in text with blank lines.
* #410: Startup banner that shows Python and bpython version
* #426: Experimental mutliline autocompletion.
* #426: Experimental multiline autocompletion.
* fish style last history completion with Arrow Right. Thanks to Nicholas
Sweeting.
* fish style automatic reverse history search with Arrow Up.
Expand Down Expand Up @@ -377,7 +377,7 @@ As always, please submit any bugs you might find to our bugtracker.

* #87: Add a closed attribute to Repl to fix mercurial.ui.ui expecting stderr
to have this attribute.
* #108: Unicode characters in docsrting crash bpython
* #108: Unicode characters in docstring crash bpython
* #118: Load_theme is not defined.
* #99: Configurable font now documented.
* #123: <F8> Pastebin can't handle 'ESC' key
Expand Down Expand Up @@ -522,7 +522,7 @@ Probably some other things, but I hate changelogs. :)
0.8.0
------

It's been a long while since the last release and there've been numerous little
It's been a long while since the last release and there have been numerous little
bugfixes and extras here and there so I'm putting this out as 0.8.0. Check the
hg commit history if you want more info:
http://bitbucket.org/bobf/bpython/
Expand Down
2 changes: 1 addition & 1 deletion bpython/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
try:
from bpython._version import __version__ as version
except ImportError:
version = 'unkown'
version = 'unknown'

__version__ = version
package_dir = os.path.abspath(os.path.dirname(__file__))
Expand Down
2 changes: 1 addition & 1 deletion bpython/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# The MIT License
#
# Copyirhgt (c) 2015 Sebastian Ramacher
# Copyright (c) 2015 Sebastian Ramacher
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down
12 changes: 6 additions & 6 deletions bpython/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

# Modified by Brandon Navra
# Notes for Windows
# Prerequsites
# Prerequisites
# - Curses
# - pyreadline
#
Expand Down Expand Up @@ -434,7 +434,7 @@ def check(self):

def clear_current_line(self):
"""Called when a SyntaxError occurred in the interpreter. It is
used to prevent autoindentation from occuring after a
used to prevent autoindentation from occurring after a
traceback."""
repl.Repl.clear_current_line(self)
self.s = ''
Expand All @@ -449,7 +449,7 @@ def clear_wrapped_lines(self):
self.scr.clrtoeol()

def complete(self, tab=False):
"""Get Autcomplete list and window.
"""Get Autocomplete list and window.

Called whenever these should be updated, and called
with tab
Expand Down Expand Up @@ -1375,7 +1375,7 @@ def lsize():
get_colpair(self.config, 'comment'))
# XXX: After all the trouble I had with sizing the list box (I'm not very good
# at that type of thing) I decided to do this bit of tidying up here just to
# make sure there's no unnececessary blank lines, it makes things look nicer.
# make sure there's no unnecessary blank lines, it makes things look nicer.

y = self.list_win.getyx()[0]
self.list_win.resize(y + 2, w)
Expand All @@ -1396,7 +1396,7 @@ def lsize():

def size(self):
"""Set instance attributes for x and y top left corner coordinates
and width and heigth for the window."""
and width and height for the window."""
global stdscr
h, w = stdscr.getmaxyx()
self.y = 0
Expand Down Expand Up @@ -1566,7 +1566,7 @@ def __init__(self, scr, pwin, background, config, s=None, c=None):

def size(self):
"""Set instance attributes for x and y top left corner coordinates
and width and heigth for the window."""
and width and height for the window."""
h, w = gethw()
self.y = h - 1
self.w = w
Expand Down
2 changes: 1 addition & 1 deletion bpython/clipboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def command_exists(command):


def get_clipboard():
"""Get best clipboard handling implemention for current system."""
"""Get best clipboard handling implementation for current system."""

if platform.system() == 'Darwin':
if command_exists('pbcopy'):
Expand Down
2 changes: 1 addition & 1 deletion bpython/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def can_encode(c):


def supports_box_chars():
"""Check if the encoding suppors Unicode box characters."""
"""Check if the encoding supports Unicode box characters."""
return all(map(can_encode, u'│─└┘┌┐'))


Expand Down
2 changes: 1 addition & 1 deletion bpython/curtsiesfrontend/manual_readline.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def add(self, key, func, overwrite=False):

def add_config_attr(self, config_attr, func):
if config_attr in self.awaiting_config:
raise ValueError('config attrribute %r already has a mapping' %
raise ValueError('config attribute %r already has a mapping' %
(config_attr,))
self.awaiting_config[config_attr] = func

Expand Down
2 changes: 1 addition & 1 deletion bpython/curtsiesfrontend/repl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,7 @@ def send_to_stdout(self, output):
def send_to_stderr(self, error):
"""Send unicode strings or FmtStr to Repl stderr

Must be able to handle FmtStrs because interepter pass in
Must be able to handle FmtStrs because interpreter pass in
tracebacks already formatted."""
lines = error.split('\n')
if lines[-1]:
Expand Down
2 changes: 1 addition & 1 deletion bpython/formatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

"""These format strings are pretty ugly.
\x01 represents a colour marker, which
can be proceded by one or two of
can be preceded by one or two of
the following letters:
k, r, g, y, b, m, c, w, d
Which represent:
Expand Down
2 changes: 1 addition & 1 deletion bpython/history.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# The MIT License
#
# Copyright (c) 2009 the bpython authors.
# Copyirhgt (c) 2012,2015 Sebastian Ramacher
# Copyright (c) 2012,2015 Sebastian Ramacher
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions bpython/repl.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def __init__(self, locals=None, encoding=None):
on a caught syntax error. The purpose for this in bpython is so that
the repl can be instantiated after the interpreter (which it
necessarily must be with the current factoring) and then an exception
callback can be added to the Interpeter instance afterwards - more
callback can be added to the Interpreter instance afterwards - more
specifically, this is so that autoindentation does not occur after a
traceback."""

Expand Down Expand Up @@ -1023,10 +1023,10 @@ def tokenize(self, s, newline=False):

def clear_current_line(self):
"""This is used as the exception callback for the Interpreter instance.
It prevents autoindentation from occuring after a traceback."""
It prevents autoindentation from occurring after a traceback."""

def send_to_external_editor(self, text, filename=None):
"""Returns modified text from an editor, or the oriignal text if editor
"""Returns modified text from an editor, or the original text if editor
exited with non-zero"""

encoding = getpreferredencoding()
Expand Down
4 changes: 2 additions & 2 deletions bpython/simpleeval.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def parse_trees(cursor_offset, line):


def evaluate_current_attribute(cursor_offset, line, namespace=None):
"""Safely evaluates the expression having an attributed accesssed"""
"""Safely evaluates the expression having an attributed accessed"""
# this function runs user code in case of custom descriptors,
# so could fail in any way

Expand All @@ -240,7 +240,7 @@ def evaluate_current_attribute(cursor_offset, line, namespace=None):


def safe_get_attribute(obj, attr):
"""Gets attributes without triggering descriptors on new-style clases"""
"""Gets attributes without triggering descriptors on new-style classes"""
if is_new_style(obj):
with AttrCleaner(obj):
result = safe_get_attribute_new_style(obj, attr)
Expand Down
2 changes: 1 addition & 1 deletion bpython/test/test_crashers.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def run_bpython(self, input):
enter the given input. Uses a test config that disables the
paste detection.

Retuns bpython's output.
Returns bpython's output.
"""
result = Deferred()

Expand Down
2 changes: 1 addition & 1 deletion bpython/test/test_curtsies_painting.py
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ def test_cursor_stays_at_bottom_of_screen(self):
self.assert_paint_ignoring_formatting(screen, (2, 4))

def test_unhighlight_paren_bugs(self):
"""two previous bugs, paren did't highlight until next render
"""two previous bugs, parent didn't highlight until next render
and paren didn't unhighlight until enter"""
self.assertEqual(self.repl.rl_history.entries, [''])
self.enter('(')
Expand Down
22 changes: 11 additions & 11 deletions bpython/test/test_simpleeval.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,19 +162,19 @@ def s4(self):
raise AssertionError('Property __get__ executed')


class OverridenGetattr(object):
class OverriddenGetattr(object):
def __getattr__(self, attr):
raise AssertionError('custom __getattr__ executed')
a = 1


class OverridenGetattribute(object):
class OverriddenGetattribute(object):
def __getattribute__(self, attr):
raise AssertionError('custom __getattrribute__ executed')
raise AssertionError('custom __getattribute__ executed')
a = 1


class OverridenMRO(object):
class OverriddenMRO(object):
def __mro__(self):
raise AssertionError('custom mro executed')
a = 1
Expand Down Expand Up @@ -236,17 +236,17 @@ def test_lookup_with_property_and_slots(self):
Slots.__dict__['s3'])
self.assertIsInstance(sga(SlotsSubclass, 's3'), property)

def test_lookup_on_overriden_methods(self):
def test_lookup_on_overridden_methods(self):
sga = safe_get_attribute
self.assertEqual(sga(OverridenGetattr(), 'a'), 1)
self.assertEqual(sga(OverridenGetattribute(), 'a'), 1)
self.assertEqual(sga(OverridenMRO(), 'a'), 1)
self.assertEqual(sga(OverriddenGetattr(), 'a'), 1)
self.assertEqual(sga(OverriddenGetattribute(), 'a'), 1)
self.assertEqual(sga(OverriddenMRO(), 'a'), 1)
with self.assertRaises(AttributeError):
sga(OverridenGetattr(), 'b')
sga(OverriddenGetattr(), 'b')
with self.assertRaises(AttributeError):
sga(OverridenGetattribute(), 'b')
sga(OverriddenGetattribute(), 'b')
with self.assertRaises(AttributeError):
sga(OverridenMRO(), 'b')
sga(OverriddenMRO(), 'b')

if __name__ == '__main__':
unittest.main()
4 changes: 2 additions & 2 deletions data/bpython.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
bpython is a fancy interface to the Python interpreter. It has the
following features:
<ul>
<li>In-line syntac highlighting.</li>
<li>Readline-like autocomplete with suggesstion displayed as you type.</li>
<li>In-line syntax highlighting.</li>
<li>Readline-like autocomplete with suggestion displayed as you type.</li>
<li>Expected parameter list for any Python function.</li>
<li>"Rewind" function to pop the last line of code from memory and re-evaluate.</li>
<li>Send the code you've entered off to a pastebin.</li>
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx/source/themes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Themes
======
This chapter is about bpython's theming capabalities.
This chapter is about bpython's theming capabilities.

bpython uses .theme files placed in your ``$XDG_CONFIG_HOME/bpython`` directory
[#f1]_. You can set the theme in the :ref:`configuration_color_scheme` option
Expand All @@ -20,7 +20,7 @@ Available Colors
* w = white
* d = default, this will make the switch default to the bpython default theme

Any letter writting uppercase will make the switch bold.
Any letter writing uppercase will make the switch bold.

Available Switches
------------------
Expand Down