diff --git a/contrib/githooks/install-hooks.sh b/contrib/githooks/install-hooks.sh index 82255683a0..06f40ac8ee 100755 --- a/contrib/githooks/install-hooks.sh +++ b/contrib/githooks/install-hooks.sh @@ -25,7 +25,7 @@ SYMLINKED_FILES=() symlink_file () { [ "$(${READLINK_CMD} ${2})" = "${1}" ] \ && { - echo -e "\033[90mSkipping '\033[33m$(basename ${1})\033[90m'... Alread linked." + echo -e "\033[90mSkipping '\033[33m$(basename ${1})\033[90m'... Already linked." return 0 } || true @@ -75,5 +75,5 @@ for file_to_link in "${TO_LINK[@]}"; do } done -echo -e "\033[42mGit hooks installed succesfully.\033[0m" -exit 0 \ No newline at end of file +echo -e "\033[42mGit hooks installed successfully.\033[0m" +exit 0 diff --git a/sopel/coretasks.py b/sopel/coretasks.py index 7dc6b3ac24..53685ae5a6 100644 --- a/sopel/coretasks.py +++ b/sopel/coretasks.py @@ -472,7 +472,7 @@ def track_quit(bot, trigger): @sopel.module.unblockable def receive_cap_list(bot, trigger): cap = trigger.strip('-=~') - # Server is listing capabilites + # Server is listing capabilities if trigger.args[1] == 'LS': receive_cap_ls_reply(bot, trigger) # Server denied CAP REQ diff --git a/sopel/irc/__init__.py b/sopel/irc/__init__.py index 668231be68..bf38b225db 100644 --- a/sopel/irc/__init__.py +++ b/sopel/irc/__init__.py @@ -360,7 +360,7 @@ def write(self, args, text=None): ``args`` is an iterable of strings, which are joined by spaces. ``text`` is treated as though it were the final item in ``args``, but - is preceeded by a ``:``. This is a special case which means that + is preceded by a ``:``. This is a special case which means that ``text``, unlike the items in ``args`` may contain spaces (though this constraint is not checked by ``write``). diff --git a/sopel/logger.py b/sopel/logger.py index 59a1ad6754..d0e66781a7 100644 --- a/sopel/logger.py +++ b/sopel/logger.py @@ -87,7 +87,7 @@ def setup_logging(settings): 'when': 'midnight', 'formatter': 'sopel', }, - # catched error log file + # caught error log file 'errorfile': { 'level': 'ERROR', 'class': 'logging.handlers.TimedRotatingFileHandler', diff --git a/sopel/modules/bugzilla.py b/sopel/modules/bugzilla.py index 9b6fa5e791..8eab1cd40c 100644 --- a/sopel/modules/bugzilla.py +++ b/sopel/modules/bugzilla.py @@ -76,7 +76,7 @@ def show_bug(bot, trigger, match=None): if error: LOGGER.warning('Bugzilla error: %s' % error) - bot.say('[BUGZILLA] Unable to get infomation for ' + bot.say('[BUGZILLA] Unable to get information for ' 'linked bug (%s)' % error) return diff --git a/sopel/modules/meetbot.py b/sopel/modules/meetbot.py index c5a7f29eb8..56d6277fb9 100644 --- a/sopel/modules/meetbot.py +++ b/sopel/modules/meetbot.py @@ -512,7 +512,7 @@ def take_comment(bot, trigger): See [meetbot module usage]({% link _usage/meetbot-module.md %}) """ - if not trigger.group(4): # <2 arguements were given + if not trigger.group(4): # <2 arguments were given bot.say( "Usage: {}comment <#channel> ".format( bot.config.core.help_prefix diff --git a/sopel/tools/calculation.py b/sopel/tools/calculation.py index bf4ab8b397..b5006464f2 100644 --- a/sopel/tools/calculation.py +++ b/sopel/tools/calculation.py @@ -98,7 +98,7 @@ def guarded_mul(left, right): def pow_complexity(num, exp): """Estimate the worst case time pow(num, exp) takes to calculate. - This function is based on experimetal data from the time it takes to + This function is based on experimental data from the time it takes to calculate "num**exp" on laptop with i7-2670QM processor on a 32 bit CPython 2.7.6 interpreter on Windows. @@ -123,7 +123,7 @@ def pow_complexity(num, exp): The function number were selected by starting with the theoretical complexity of exp * log2(num)**2 and fiddling with the exponents - untill it more or less matched with the table. + until it more or less matched with the table. Because this function is based on a limited set of data it might not give accurate results outside these boundaries. The results @@ -146,7 +146,7 @@ def guarded_pow(left, right): elif not isinstance(right, numbers.Integral): pass elif pow_complexity(left, right) < 0.5: - # Value 0.5 is arbitary and based on a estimated runtime of 0.5s + # Value 0.5 is arbitrary and based on an estimated runtime of 0.5s # on a fairly decent laptop processor. pass else: diff --git a/sopel/tools/time.py b/sopel/tools/time.py index 164e6a1671..59622ee5ab 100644 --- a/sopel/tools/time.py +++ b/sopel/tools/time.py @@ -93,7 +93,7 @@ def get_channel_timezone(db, channel): def get_timezone(db=None, config=None, zone=None, nick=None, channel=None): - """Find, and return, the approriate timezone + """Find, and return, the appropriate timezone Time zone is pulled in the following priority: @@ -107,7 +107,7 @@ def get_timezone(db=None, config=None, zone=None, nick=None, channel=None): If ``db`` is not given, or given but not set up, steps 2 and 3 will be skipped. If ``config`` is not given, step 4 will be skipped. If no step - yeilds a valid timezone, ``None`` is returned. + yields a valid timezone, ``None`` is returned. Valid timezones are those present in the IANA Time Zone Database. diff --git a/sopel/trigger.py b/sopel/trigger.py index 59ee1799de..9a70e246d1 100644 --- a/sopel/trigger.py +++ b/sopel/trigger.py @@ -175,7 +175,7 @@ class Trigger(unicode): """The account name of the user sending the message. This is only available if either the account-tag or the account-notify and - extended-join capabilites are available. If this isn't the case, or the user + extended-join capabilities are available. If this isn't the case, or the user sending the message isn't logged in, this will be None. """ diff --git a/test/modules/test_modules_isup.py b/test/modules/test_modules_isup.py index 5136ab1ddb..bacdfd0869 100644 --- a/test/modules/test_modules_isup.py +++ b/test/modules/test_modules_isup.py @@ -15,10 +15,10 @@ # with scheme ('http://example.com', 'http://example.com'), ('https://example.com', 'https://example.com'), - # wich scheme and URL path + # with scheme and URL path ('http://example.com/path', 'http://example.com/path'), ('https://example.com/path', 'https://example.com/path'), - # wich scheme, URL path, and query string + # with scheme, URL path, and query string ('http://example.com/path?p=val', 'http://example.com/path?p=val'), ('https://example.com/path?p=val', 'https://example.com/path?p=val'), # not .com TLD