summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Wilk <jwilk@jwilk.net>2016-07-27 21:54:06 +0200
committerPhil Frost <indigo@bitglue.com>2016-07-27 15:54:06 -0400
commit9883d104e5559fb20a96fa68e537b702a09ec8f2 (patch)
tree93ee8bb07f4d80f10a3a6194ad9d9d14aec66bb6
parent152ca182a603d7327925873db9a795797812968d (diff)
downloadpyflakes-9883d104e5559fb20a96fa68e537b702a09ec8f2.tar.gz
Fix typos (#77)
-rw-r--r--NEWS.txt2
-rw-r--r--pyflakes/checker.py4
-rw-r--r--pyflakes/test/test_imports.py6
-rw-r--r--pyflakes/test/test_other.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/NEWS.txt b/NEWS.txt
index 8396109..d887c67 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -5,7 +5,7 @@
- Avoid traceback when exception is del-ed in except
1.2.1 (2015-05-05):
- - Fix false RedefinedWhileUnesed for submodule imports
+ - Fix false RedefinedWhileUnused for submodule imports
1.2.0 (2016-05-03):
- Warn against reusing exception names after the except: block on Python 3
diff --git a/pyflakes/checker.py b/pyflakes/checker.py
index 68b4e8f..1902f13 100644
--- a/pyflakes/checker.py
+++ b/pyflakes/checker.py
@@ -304,7 +304,7 @@ class ImportationFrom(Importation):
class StarImportation(Importation):
- """A binding created by an 'from x import *' statement."""
+ """A binding created by a 'from x import *' statement."""
def __init__(self, name, source):
super(StarImportation, self).__init__('*', source)
@@ -799,7 +799,7 @@ class Checker(object):
return
if on_conditional_branch():
- # We can not predict if this conditional branch is going to
+ # We cannot predict if this conditional branch is going to
# be executed.
return
diff --git a/pyflakes/test/test_imports.py b/pyflakes/test/test_imports.py
index f1bb5cd..3e3be88 100644
--- a/pyflakes/test/test_imports.py
+++ b/pyflakes/test/test_imports.py
@@ -180,7 +180,7 @@ class Test(TestCase):
def test_redefinedTry(self):
"""
- Test that importing a module twice in an try block
+ Test that importing a module twice in a try block
does raise a warning.
"""
self.flakes('''
@@ -193,7 +193,7 @@ class Test(TestCase):
def test_redefinedTryExcept(self):
"""
- Test that importing a module twice in an try
+ Test that importing a module twice in a try
and except block does not raise a warning.
"""
self.flakes('''
@@ -1149,7 +1149,7 @@ class TestSpecialAll(TestCase):
class Python26Tests(TestCase):
"""
- Tests for checking of syntax which is valid in PYthon 2.6 and newer.
+ Tests for checking of syntax which is valid in Python 2.6 and newer.
"""
@skipIf(version_info < (2, 6), "Python >= 2.6 only")
diff --git a/pyflakes/test/test_other.py b/pyflakes/test/test_other.py
index 7efc1c5..90b980b 100644
--- a/pyflakes/test/test_other.py
+++ b/pyflakes/test/test_other.py
@@ -1181,7 +1181,7 @@ class TestUnusedAssignment(TestCase):
return
''', m.UnusedVariable)
- @skip("todo: Difficult because it does't apply in the context of a loop")
+ @skip("todo: Difficult because it doesn't apply in the context of a loop")
def test_unusedReassignedVariable(self):
"""
Shadowing a used variable can still raise an UnusedVariable warning.
@@ -1489,7 +1489,7 @@ class TestUnusedAssignment(TestCase):
def test_withStatementTupleNamesUndefined(self):
"""
- An undefined name warning is emitted if a name first defined by a the
+ An undefined name warning is emitted if a name first defined by the
tuple-unpacking form of the C{with} statement is used before the
C{with} statement.
"""