diff options
| -rw-r--r-- | ChangeLog | 48 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | checkers/__init__.py | 2 | ||||
| -rwxr-xr-x | checkers/base.py | 8 | ||||
| -rw-r--r-- | checkers/classes.py | 22 | ||||
| -rw-r--r-- | checkers/exceptions.py | 2 | ||||
| -rw-r--r-- | checkers/format.py | 8 | ||||
| -rw-r--r-- | checkers/imports.py | 2 | ||||
| -rw-r--r-- | checkers/similar.py | 2 | ||||
| -rw-r--r-- | checkers/typecheck.py | 22 | ||||
| -rw-r--r-- | checkers/utils.py | 8 | ||||
| -rw-r--r-- | checkers/variables.py | 18 | ||||
| -rw-r--r-- | config.py | 2 | ||||
| -rw-r--r-- | doc/beginner_pylint_tutorial.txt | 6 | ||||
| -rw-r--r-- | doc/features.txt | 54 | ||||
| -rw-r--r-- | doc/manual.txt | 24 | ||||
| -rw-r--r-- | doc/quickstart.txt | 6 | ||||
| -rwxr-xr-x | epylint.py | 2 | ||||
| -rw-r--r-- | examples/pylintrc | 16 | ||||
| -rw-r--r-- | gui.py | 4 | ||||
| -rw-r--r-- | interfaces.py | 2 | ||||
| -rw-r--r-- | lint.py | 26 | ||||
| -rw-r--r-- | man/pylint.1 | 14 | ||||
| -rw-r--r-- | man/pyreverse.1 | 2 | ||||
| -rw-r--r-- | pyreverse/diadefslib.py | 2 | ||||
| -rw-r--r-- | pyreverse/diagrams.py | 6 | ||||
| -rw-r--r-- | pyreverse/main.py | 2 | ||||
| -rw-r--r-- | test/input/func_block_disable_msg.py | 4 | ||||
| -rw-r--r-- | test/test_func.py | 8 | ||||
| -rw-r--r-- | test/test_regr.py | 2 |
30 files changed, 164 insertions, 164 deletions
@@ -19,7 +19,7 @@ ChangeLog for PyLint * fix #8332: set E0501 line no to the first line where non ascii character has been found - * avoid some E0203 / E0602 false negatives by detecting respectivly + * avoid some E0203 / E0602 false negatives by detecting respectively AttributeError / NameError * implements #4037: don't issue W0142 (* or ** magic) when they are barely @@ -105,7 +105,7 @@ ChangeLog for PyLint * fix bug in reenabling message - * fix #2473: invoking pylint on __init__.py (hopefuly) + * fix #2473: invoking pylint on __init__.py (hopefully) * typecheck: acquired-members option has been dropped in favor of the more generic generated-members option. If the zope option is set, the behaviour @@ -147,12 +147,12 @@ ChangeLog for PyLint 2007-02-28 -- 0.13.0 - * new RPython (Restricted Python) checker for PyPy felow or people + * new RPython (Restricted Python) checker for PyPy fellow or people wanting to get a compiled version of their python program using the translator of the PyPy project. For more information about PyPy or RPython, visit http://codespeak.net/pypy/ - * new E0104 and E0105 messages introduced to respectivly warn about + * new E0104 and E0105 messages introduced to respectively warn about "return" and "yield" outside function or method * new E0106 message when "yield" and "return something" are mixed in a @@ -171,11 +171,11 @@ ChangeLog for PyLint * allow disable-all option inline (#3218, patch submitted by Daniel Drake) - * --init-hook option to call arbitray code necessary to set + * --init-hook option to call arbitrary code necessary to set environment (eg sys.path) (#3156) * One more Daniel's patch fixing a command line option parsing - problem, this'll definitly be the DDrake release :) + problem, this'll definitely be the DDrake release :) * fix #3184: crashes on "return" outside function @@ -200,7 +200,7 @@ ChangeLog for PyLint * fix #2508: E0601 false positive with lambda * fix #3125: E1101 false positive and a message duplication. Only the last part - is actually fixed since the initial false positive is due to dynaming setting of + is actually fixed since the initial false positive is due to dynamic setting of attributes on the decimal.Context class. * fix #3149: E0101 false positives and introduced E0100 for generator __init__ @@ -237,9 +237,9 @@ ChangeLog for PyLint (close #14081) * new W0105 and W0106 messages extracted from W0104 (statement seems - to have no effect) respectivly when the statement is actually string + to have no effect) respectively when the statement is actually string (that's sometimes used instead of comments for documentation) or an - empty statement generated by a useless semicolumn + empty statement generated by a useless semicolon * reclassified W0302 to C0302 @@ -291,12 +291,12 @@ ChangeLog for PyLint * a new typecheck checker, introducing the following checks: - - E1101, access to unexistant member (implements #10430), remove + - E1101, access to unexistent member (implements #10430), remove the need of E0201 and so some options has been moved from the classes checker to this one - E1102, calling a non callable object - - E1111 and W1111 when an assigment is done on a function call but the - infered function returns None (implements #10431) + - E1111 and W1111 when an assignment is done on a function call but the + inferred function returns None (implements #10431) * change in the base checker: @@ -306,12 +306,12 @@ ChangeLog for PyLint - list comprehension and generator expression variables have their own regular expression (the inlinevar-rgx option) (implements #9146) - - the C0101 check with its min-name-lentgh option has + - the C0101 check with its min-name-length option has been removed (this can be specified in the regxp after all...) - W0103 and W0121 are now handled by the variables checker (W0103 is now W0603 and W0604 has been splitted into different messages) - W0131 and W0132 messages have been reclassified to C0111 and - C0112 respectivly + C0112 respectively - new W0104 message on statement without effect * regexp support for dummy-variables (dummy-variables-rgx option @@ -352,7 +352,7 @@ ChangeLog for PyLint * fixed some E0203 ("access to member before its definition") false positive - * fixed E0214 ("metaclass method frist argument should be mcs) false + * fixed E0214 ("metaclass method first argument should be mcs) false positive with staticmethod used on a metaclass * fixed packaging which was missing the test/regrtest_data directory @@ -559,7 +559,7 @@ ChangeLog for PyLint both using a specific command line tool and integrated as a pylint's checker - * imports checker may report import dependancies as a dot graph + * imports checker may report import dependencies as a dot graph * new checker regrouping most Refactor detection (with some new metrics) @@ -622,7 +622,7 @@ ChangeLog for PyLint * added a parsable text output, used when the --parsable option is provided - * added an emacs mode using this output, availabe in the distrib's + * added an emacs mode using this output, available in the distrib's elisp directory * fixed some typos in messages @@ -656,7 +656,7 @@ ChangeLog for PyLint * remove print statement from imports checkers - * provide a simple tk gui, essentially usefull for windows users + * provide a simple tk gui, essentially useful for windows users @@ -667,9 +667,9 @@ ChangeLog for PyLint * imports checker checks for reimport of modules * classes checker checks for calls to ancestor's __init__ and abstract - method not overriden. It doesn't complain anymore for unused import in + method not overridden. It doesn't complain anymore for unused import in __init__ files, and provides a new option ignore-interface-methods, - usefull when you're using zope Interface implementation in your project + useful when you're using zope Interface implementation in your project * base checker checks for black listed builtins call (controled by the bad-functions option) and for use of * and ** @@ -716,7 +716,7 @@ ChangeLog for PyLint modules * do not print redefinition warning for function/class/method defined - in mutually exclusive branchs + in mutually exclusive branches @@ -747,7 +747,7 @@ ChangeLog for PyLint 2003-09-12 -- 0.2.0 * new source encoding / FIXME checker (pep 263) - * new --zope option which trigger Zope import. Usefull to check Zope + * new --zope option which trigger Zope import. Useful to check Zope products code. * new --comment option which enable the evaluation note comment @@ -755,7 +755,7 @@ ChangeLog for PyLint * a ton of bug fixes - * easy functionnal test infrastructure + * easy functional test infrastructure @@ -767,7 +767,7 @@ ChangeLog for PyLint 2003-06-01 -- 0.1.1 - * much more functionnalities ! + * much more functionalities ! @@ -17,7 +17,7 @@ From the source distribution, extract the tarball and run :: python setup.py install -You'll have to install dependancies in a similar way. For debian and +You'll have to install dependencies in a similar way. For debian and rpm packages, use your usual tools according to your Linux distribution. More information about installation and available distribution format @@ -52,7 +52,7 @@ Contributors * Amaury Forgeot d'Arc: patch to check names imported from a module exists in the module * Benjamin Niemann: patch to allow block level enabling/disabling of messages -* Nathaniel Manista: suspcicious lambda checking +* Nathaniel Manista: suspicious lambda checking * Wolfgang Grafen, Axel Muller, Fabio Zadrozny, Pierre Rouleau, Maarten ter Huurne, Mirko Friedenhagen (among others): bug reports, feedback, feature requests... diff --git a/checkers/__init__.py b/checkers/__init__.py index 4f21468..657bebe 100644 --- a/checkers/__init__.py +++ b/checkers/__init__.py @@ -125,7 +125,7 @@ class BaseRawChecker(BaseChecker): self.process_tokens(tokenize.generate_tokens(stream.readline)) def process_tokens(self, tokens): - """should be overiden by subclasses""" + """should be overridden by subclasses""" raise NotImplementedError() diff --git a/checkers/base.py b/checkers/base.py index 3b66931..b078537 100755 --- a/checkers/base.py +++ b/checkers/base.py @@ -28,7 +28,7 @@ from pylint.checkers import BaseChecker import re -# regex for class/function/variable/constant nane +# regex for class/function/variable/constant name CLASS_NAME_RGX = re.compile('[A-Z_][a-zA-Z0-9]+$') MOD_NAME_RGX = re.compile('(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$') CONST_NAME_RGX = re.compile('(([A-Z_][A-Z0-9_]*)|(__.*__))$') @@ -180,7 +180,7 @@ class BasicChecker(BaseChecker): """checks for : * doc strings * modules / classes / functions / methods / arguments / variables name - * number of arguments, local variables, branchs, returns and statements in + * number of arguments, local variables, branches, returns and statements in functions, methods * required module attributes * dangerous default values as arguments @@ -505,7 +505,7 @@ functions, methods self._check_unreachable(node) def visit_exec(self, node): - """just pring a warning on exec statements""" + """just print a warning on exec statements""" self.add_message('W0122', node=node) def visit_callfunc(self, node): @@ -514,7 +514,7 @@ functions, methods """ if isinstance(node.func, astng.Name): name = node.func.name - # ignore the name if it's not a builtin (ie not defined in the + # ignore the name if it's not a builtin (i.e. not defined in the # locals nor globals scope) if not (node.frame().has_key(name) or node.root().has_key(name)): diff --git a/checkers/classes.py b/checkers/classes.py index b8bec95..eb306d5 100644 --- a/checkers/classes.py +++ b/checkers/classes.py @@ -27,11 +27,11 @@ from pylint.checkers.utils import PYMETHODS, overrides_a_method MSGS = { 'F0202': ('Unable to check methods signature (%s / %s)', 'Used when PyLint has been unable to check methods signature \ - compatibility for an unexpected raison. Please report this kind \ + compatibility for an unexpected reason. Please report this kind \ if you don\'t make sense of it.'), 'E0202': ('An attribute inherited from %s hide this method', - 'Used when a class defines a method which is hiden by an \ + 'Used when a class defines a method which is hidden by an \ instance attribute from an ancestor class.'), 'E0203': ('Access to member %r before its definition line %s', 'Used when an instance member is accessed before it\'s actually\ @@ -51,7 +51,7 @@ MSGS = { 'E0213': ('Method should have "self" as first argument', 'Used when a method has an attribute different the "self" as\ first argument. This is considered as an error since this is\ - a soooo common convention that you should\'nt break it!'), + a so common convention that you shouldn\'t break it!'), 'C0202': ('Class method should have "cls" as first argument', # E0212 'Used when a class method has an attribute different than "cls"\ as first argument, to easily differentiate them from regular \ @@ -81,7 +81,7 @@ MSGS = { 'Used when a method signature is different than in the \ implemented interface or in an overridden method.'), 'W0223': ('Method %r is abstract in class %r but is not overridden', - 'Used when an abstract method (ie raise NotImplementedError) is \ + 'Used when an abstract method (i.e. raise NotImplementedError) is \ not overridden in concrete class.' ), 'F0220': ('failed to resolve interfaces implemented by %s (%s)', # W0224 @@ -106,7 +106,7 @@ class ClassChecker(BaseChecker): """checks for : * methods without self as first argument * overridden methods signature - * access only to existant members via self + * access only to existent members via self * attributes not defined in the __init__ method * supported interfaces implementation * unreachable code @@ -170,7 +170,7 @@ instance attributes.'} def leave_class(self, cnode): """close a class node: check that instance attributes are defined in __init__ and check - access to existant members + access to existent members """ # checks attributes are defined in an allowed method such as __init__ defining_methods = self.config.defining_attr_methods @@ -194,7 +194,7 @@ instance attributes.'} cnode.local_attr(attr) except astng.NotFoundError: self.add_message('W0201', args=attr, node=node) - # check access to existant members on non metaclass classes + # check access to existent members on non metaclass classes accessed = self._accessed.pop() if cnode.type != 'metaclass': self._check_accessed_members(cnode, accessed) @@ -211,14 +211,14 @@ instance attributes.'} if node.name == '__init__': self._check_init(node) return - # check signature if the method overrload an herited method + # check signature if the method overloads inherited method for overridden in klass.local_attr_ancestors(node.name): # get astng for the searched method try: meth_node = overridden[node.name] except KeyError: # we have found the method but it's not in the local - # dictionnary. + # dictionary. # This may happen with astng build from living objects continue if not isinstance(meth_node, astng.Function): @@ -322,7 +322,7 @@ instance attributes.'} if len(defstmts) == 1: defstmt = defstmts[0] # check that if the node is accessed in the same method as - # it's defined, it's accessed after the initial assigment + # it's defined, it's accessed after the initial assignment frame = defstmt.frame() lno = defstmt.fromlineno for _node in nodes: @@ -398,7 +398,7 @@ instance attributes.'} for imethod in iface.methods(): name = imethod.name if name.startswith('_') or name in ignore_iface_methods: - # don't check method begining with an underscore, + # don't check method beginning with an underscore, # usually belonging to the interface implementation continue # get class method astng diff --git a/checkers/exceptions.py b/checkers/exceptions.py index 9e64d0f..af9d2d0 100644 --- a/checkers/exceptions.py +++ b/checkers/exceptions.py @@ -74,7 +74,7 @@ class ExceptionsChecker(BaseChecker): options = () def visit_raise(self, node): - """visit raise possibly infering value""" + """visit raise possibly inferring value""" # ignore empty raise if node.type is None: return diff --git a/checkers/format.py b/checkers/format.py index 00b10f8..fd6bc99 100644 --- a/checkers/format.py +++ b/checkers/format.py @@ -36,7 +36,7 @@ MSGS = { 'C0301': ('Line too long (%s/%s)', 'Used when a line is longer than a given number of characters.'), 'C0302': ('Too many lines in module (%s)', # was W0302 - 'Used when a module has too much lines, reducing its readibility.' + 'Used when a module has too much lines, reducing its readability.' ), 'W0311': ('Bad indentation. Found %s %s, expected %s', @@ -45,11 +45,11 @@ MSGS = { 'W0312': ('Found indentation with %ss instead of %ss', 'Used when there are some mixed tabs and spaces in a module.'), 'W0301': ('Unnecessary semicolon', # was W0106 - 'Used when a statement is endend by a semi-colon (";"), which \ + 'Used when a statement is ended by a semi-colon (";"), which \ isn\'t necessary (that\'s python, not C ;).'), 'F0321': ('Format detection error in %r', - 'Used when an unexpected error occured in bad format detection.' + 'Used when an unexpected error occurred in bad format detection.' 'Please report the error if it occurs.'), 'C0321': ('More than one statement on a single line', 'Used when more than on statement are found on the same line.'), @@ -123,7 +123,7 @@ def get_string_coords(line): return result def in_coords(match, string_coords): - """return true if the match in in the string coord""" + """return true if the match is in the string coord""" mstart = match.start() for start, end in string_coords: if mstart >= start and mstart < end: diff --git a/checkers/imports.py b/checkers/imports.py index 1eef1f3..37df06c 100644 --- a/checkers/imports.py +++ b/checkers/imports.py @@ -59,7 +59,7 @@ def filter_dependencies_info(dep_info, package_dir, mode='external'): def make_tree_defs(mod_files_list): """get a list of 2-uple (module, list_of_files_which_import_this_module), - it will return a dictionnary to represent this as a tree + it will return a dictionary to represent this as a tree """ tree_defs = {} for mod, files in mod_files_list: diff --git a/checkers/similar.py b/checkers/similar.py index 0db002a..60a6ec0 100644 --- a/checkers/similar.py +++ b/checkers/similar.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License along with # this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -"""a similarties / code duplication command line tool and pylint checker +"""a similarities / code duplication command line tool and pylint checker """ from __future__ import generators diff --git a/checkers/typecheck.py b/checkers/typecheck.py index df051ed..2872a17 100644 --- a/checkers/typecheck.py +++ b/checkers/typecheck.py @@ -29,20 +29,20 @@ from pylint.checkers.utils import safe_infer, is_super, display_type MSGS = { 'E1101': ('%s %r has no %r member', - 'Used when a variable is accessed for an unexistant member.'), + 'Used when a variable is accessed for an unexistent member.'), 'E1102': ('%s is not callable', - 'Used when an object being called has been infered to a non \ + 'Used when an object being called has been inferred to a non \ callable object'), 'E1103': ('%s %r has no %r member (but some types could not be inferred)', - 'Used when a variable is accessed for an unexistant member, but \ + 'Used when a variable is accessed for an unexistent member, but \ astng was not able to interpret all possible types of this \ variable.'), 'E1111': ('Assigning to function call which doesn\'t return', - 'Used when an assigment is done on a function call but the \ - infered function doesn\'t return anything.'), + 'Used when an assignment is done on a function call but the \ + inferred function doesn\'t return anything.'), 'W1111': ('Assigning to function call which only returns None', - 'Used when an assigment is done on a function call but the \ - infered function returns nothing but None.'), + 'Used when an assignment is done on a function call but the \ + inferred function returns nothing but None.'), } class TypeChecker(BaseChecker): @@ -59,7 +59,7 @@ class TypeChecker(BaseChecker): # configuration options options = (('ignore-mixin-members', {'default' : True, 'type' : 'yn', 'metavar': '<y_or_n>', - 'help' : 'Tells wether missing members accessed in mixin \ + 'help' : 'Tells whether missing members accessed in mixin \ class should be ignored. A mixin class is detected if its name ends with \ "mixin" (case insensitive).'} ), @@ -69,7 +69,7 @@ class should be ignored. A mixin class is detected if its name ends with \ 'type' : 'csv', 'metavar' : '<members names>', 'help' : 'List of classes names for which member attributes \ -should not be checked (useful for classes with attributes dynamicaly set).'} +should not be checked (useful for classes with attributes dynamically set).'} ), ('zope', @@ -104,7 +104,7 @@ accessed.'} """check that the accessed attribute exists to avoid to much false positives for now, we'll consider the code as - correct if a single of the infered nodes has the accessed attribute. + correct if a single of the inferred nodes has the accessed attribute. function/method, super call and metaclasses are ignored """ @@ -182,7 +182,7 @@ accessed.'} if not isinstance(node.value, astng.CallFunc): return function_node = safe_infer(node.value.func) - # skip class, generator and uncomplete function definition + # skip class, generator and incomplete function definition if not (isinstance(function_node, astng.Function) and function_node.root().fully_defined()): return diff --git a/checkers/utils.py b/checkers/utils.py index f3e2985..362c2f6 100644 --- a/checkers/utils.py +++ b/checkers/utils.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License along with # this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -"""some functions that may be usefull for various checkers +"""some functions that may be useful for various checkers """ from logilab import astng @@ -29,9 +29,9 @@ except AttributeError: FOR_NODE_TYPES = (astng.For, astng.Comprehension) def safe_infer(node): - """return the infered value for the given node. + """return the inferred value for the given node. Return None if inference failed or if there is some ambiguity (more than - one node has been infered) + one node has been inferred) """ try: inferit = node.infer() @@ -40,7 +40,7 @@ def safe_infer(node): return try: inferit.next() - return # None if there is ambiguity on the infered node + return # None if there is ambiguity on the inferred node except StopIteration: return value diff --git a/checkers/variables.py b/checkers/variables.py index b6acb23..454fc9c 100644 --- a/checkers/variables.py +++ b/checkers/variables.py @@ -30,7 +30,7 @@ from pylint.checkers.utils import PYMETHODS, is_ancestor_name, is_builtin, \ def overridden_method(klass, name): - """get overriden method if any""" + """get overridden method if any""" try: parent = klass.local_attr_ancestors(name).next() except (StopIteration, KeyError): @@ -59,9 +59,9 @@ MSGS = { 'W0601': ('Global variable %r undefined at the module level', 'Used when a variable is defined through the "global" statement \ but the variable is not defined in the module scope.'), - 'W0602': ('Using global for %r but no assigment is done', + 'W0602': ('Using global for %r but no assignment is done', 'Used when a variable is defined through the "global" statement \ - but no assigment to this variable is done.'), + but no assignment to this variable is done.'), 'W0603': ('Using the global statement', # W0121 'Used when you use the "global" statement to update a global \ variable. PyLint just try to discourage this \ @@ -96,7 +96,7 @@ class VariablesChecker(BaseChecker): * unused variables / imports * undefined variables * redefinition of variable from builtins or from an outer scope - * use of variable before assigment + * use of variable before assignment """ __implements__ = IASTNGChecker @@ -107,7 +107,7 @@ class VariablesChecker(BaseChecker): options = ( ("init-import", {'default': 0, 'type' : 'yn', 'metavar' : '<y_or_n>', - 'help' : 'Tells wether we should check for unused import in \ + 'help' : 'Tells whether we should check for unused import in \ __init__ files.'}), ("dummy-variables-rgx", {'default': ('_|dummy'), @@ -265,17 +265,17 @@ builtins. Remember that you should avoid to define new builtins when possible.' assign_nodes = [] for anode in assign_nodes: if anode.frame() is frame: - # same scope level assigment + # same scope level assignment break else: - # global but no assigment + # global but no assignment self.add_message('W0602', args=name, node=node) default_message = False if not assign_nodes: continue for anode in assign_nodes: if anode.frame() is module: - # module level assigment + # module level assignment break else: # global undefined at the module scope @@ -355,7 +355,7 @@ builtins. Remember that you should avoid to define new builtins when possible.' except KeyError: continue else: - # checks for use before assigment + # checks for use before assignment defnode = assign_parent(to_consume[name][0]) if defnode is not None: defstmt = defnode.statement() @@ -107,7 +107,7 @@ found, it defaults to ~/.pylint.d/ or .pylint.d (in the current working directory) . The current PYLINTHOME is %(PYLINT_HOME)s. * PYLINTRC path to the configuration file. If not found, it will use the first -existant file in ~/.pylintrc, /etc/pylintrc. The current PYLINTRC is +existent file in ~/.pylintrc, /etc/pylintrc. The current PYLINTRC is %(PYLINTRC)s. ''' % globals() diff --git a/doc/beginner_pylint_tutorial.txt b/doc/beginner_pylint_tutorial.txt index 20875d5..589de97 100644 --- a/doc/beginner_pylint_tutorial.txt +++ b/doc/beginner_pylint_tutorial.txt @@ -76,7 +76,7 @@ Pylint is going to 'pick on': :: * (R) refactor, for bad code smell * (W) warning, for python specific problems * (E) error, for much probably bugs in the code - * (F) fatal, if an error occured which prevented pylint from doing + * (F) fatal, if an error occurred which prevented pylint from doing further processing. When Pylint is first run on a fresh piece of code, a common complaint is that it @@ -211,7 +211,7 @@ If we run this: :: -------- +-----------+-----------+ - |message id |occurences | + |message id |occurrences | +===========+===========+ |C0103 |5 | +-----------+-----------+ @@ -301,7 +301,7 @@ a docstring to line 2, put spaces around the = sign on line 16 and use the Here's the updated code: :: 1 #!/usr/bin/env python - 2 """This script prompts a user to enter a messsage to encode or decode + 2 """This script prompts a user to enter a message to encode or decode 3 using a classic Caeser shift substitution (3 letter shift)""" 4 5 import string diff --git a/doc/features.txt b/doc/features.txt index e98f55c..4171c4f 100644 --- a/doc/features.txt +++ b/doc/features.txt @@ -79,13 +79,13 @@ Reports options command line instead of printing them on stdout. Reports (if any) will be written in a file name "pylint_global.[txt|html]". :reports: - Tells wether to display a full report or only the messages + Tells whether to display a full report or only the messages Default: ``yes`` :evaluation: Python expression which should return a note less than 10 (10 is the highest note). You have access to the variables errors warning, statement which - respectivly contain the number of errors / warnings messages and the total + respectively contain the number of errors / warnings messages and the total number of statements analyzed. This is used by the global evaluation report (R0004). @@ -119,16 +119,16 @@ Main messages :I0013: *Ignoring entire file* Used to inform that the file will not be checked :F0001: - Used when an error occured preventing the analysis of a module (unable to find + Used when an error occurred preventing the analysis of a module (unable to find it for instance). :F0002: *%s: %s* - Used when an unexpected error occured while building the ASTNG representation. + Used when an unexpected error occurred while building the ASTNG representation. This is usually accompanied by a traceback. Please report such errors ! :F0003: *ignored builtin module %s* Used to indicate that the user asked to analyze a builtin module which has been skipped. -:F0004: *unexpected infered value %s* - Used to indicate that some value of an unexpected type has been infered. +:F0004: *unexpected inferred value %s* + Used to indicate that some value of an unexpected type has been inferred. Main reports ~~~~~~~~~~~~ @@ -144,12 +144,12 @@ checks for * unused variables / imports * undefined variables * redefinition of variable from builtins or from an outer scope -* use of variable before assigment +* use of variable before assignment Options ~~~~~~~ :init-import: - Tells wether we should check for unused import in __init__ files. + Tells whether we should check for unused import in __init__ files. :dummy-variables-rgx: A regular expression matching names used for dummy variables (i.e. not used). @@ -169,9 +169,9 @@ Messages :W0601: *Global variable %r undefined at the module level* Used when a variable is defined through the "global" statement but the variable is not defined in the module scope. -:W0602: *Using global for %r but no assigment is done* +:W0602: *Using global for %r but no assignment is done* Used when a variable is defined through the "global" statement but no - assigment to this variable is done. + assignment to this variable is done. :W0603: *Using the global statement* Used when you use the "global" statement to update a global variable. PyLint just try to discourage this usage. That doesn't mean you can not use it ! @@ -201,7 +201,7 @@ Basic checker checks for : * doc strings * modules / classes / functions / methods / arguments / variables name -* number of arguments, local variables, branchs, returns and statements in +* number of arguments, local variables, branches, returns and statements in functions, methods * required module attributes * dangerous default values as arguments @@ -299,7 +299,7 @@ Messages disable it if you're using those strings as documentation, instead of comments. :W0106: *Unnecessary semicolon* - Used when a statement is endend by a semi-colon (";"), which isn't necessary + Used when a statement is ended by a semi-colon (";"), which isn't necessary (that's python, not C ;). :W0107: *Unnecessary pass statement* Used when a "pass" statement that can be avoided is encountered.) @@ -340,13 +340,13 @@ try to find bugs in the code using type inference Options ~~~~~~~ :ignore-mixin-members: - Tells wether missing members accessed in mixin class should be ignored. A + Tells whether missing members accessed in mixin class should be ignored. A mixin class is detected if its name ends with "mixin" (case insensitive). Default: ``yes`` :ignored-classes: List of classes names for which member attributes should not be checked - (useful for classes with attributes dynamicaly set). + (useful for classes with attributes dynamically set). Default: ``SQLObject`` :zope: @@ -361,17 +361,17 @@ Options Messages ~~~~~~~~ :E1101: *%s %r has no %r member* - Used when a variable is accessed for an unexistant member. + Used when a variable is accessed for an unexistent member. :E1102: *%s is not callable* - Used when an object being called has been infered to a non callable object + Used when an object being called has been inferred to a non callable object :E1103: *%s %r has no %r member (but some types could not be inferred)* - Used when a variable is accessed for an unexistant member, but astng was not + Used when a variable is accessed for an unexistent member, but astng was not able to interpret all possible types of this variable. :E1111: *Assigning to function call which doesn't return* - Used when an assigment is done on a function call but the infered function + Used when an assignment is done on a function call but the inferred function doesn't return anything. :W1111: *Assigning to function call which only returns None* - Used when an assigment is done on a function call but the infered function + Used when an assignment is done on a function call but the inferred function returns nothing but None. @@ -430,7 +430,7 @@ Classes checker checks for : * methods without self as first argument * overridden methods signature -* access only to existant members via self +* access only to existent members via self * attributes not defined in the __init__ method * supported interfaces implementation * unreachable code @@ -450,7 +450,7 @@ Options Messages ~~~~~~~~ :E0202: *An attribute inherited from %s hide this method* - Used when a class defines a method which is hiden by an instance attribute + Used when a class defines a method which is hidden by an instance attribute from an ancestor class. :E0203: *Access to member %r before its definition line %s* Used when an instance member is accessed before it's actually assigned. @@ -459,8 +459,8 @@ Messages no argument defined. :E0213: *Method should have "self" as first argument* Used when a method has an attribute different the "self" as first argument. - This is considered as an error since this is a soooo common convention that - you should'nt break it! + This is considered as an error since this is a so common convention that + you shouldn't break it! :E0221: *Interface resolved to %s is not a class* Used when a class claims to implement an interface which is not a class. :E0222: *Missing method %r from %s interface* @@ -481,7 +481,7 @@ Messages Used when a method signature is different than in the implemented interface or in an overridden method. :W0223: *Method %r is abstract in class %r but is not overridden* - Used when an abstract method (ie raise NotImplementedError) is not overridden + Used when an abstract method (i.e. raise NotImplementedError) is not overridden in concrete class. :W0231: *__init__ method from base class %r is not called* Used when an ancestor class method has an __init__ method which is not called @@ -502,7 +502,7 @@ Messages argument. :F0202: *Unable to check methods signature (%s / %s)* Used when PyLint has been unable to check methods signature compatibility for - an unexpected raison. Please report this kind if you don't make sense of it. + an unexpected reason. Please report this kind if you don't make sense of it. :F0220: *failed to resolve interfaces implemented by %s (%s)* Used when a PyLint as failed to find interfaces implemented by a class @@ -714,7 +714,7 @@ Messages :C0301: *Line too long (%s/%s)* Used when a line is longer than a given number of characters. :C0302: *Too many lines in module (%s)* - Used when a module has too much lines, reducing its readibility. + Used when a module has too much lines, reducing its readability. :C0321: *More than one statement on a single line* Used when more than on statement are found on the same line. :C0322: *Operator not preceded by a space* @@ -726,7 +726,7 @@ Messages :C0324: *Comma not followed by a space* Used when a comma (",") is not followed by a space. :F0321: *Format detection error in %r* - Used when an unexpected error occured in bad format detection.Please report + Used when an unexpected error occurred in bad format detection.Please report the error if it occurs. diff --git a/doc/manual.txt b/doc/manual.txt index a0ff8d1..eb40cdf 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -26,7 +26,7 @@ What is pylint? Pylint is a tool that checks for errors in python code, tries to enforce a coding standard and looks for smelling code. This is similar but nevertheless -different from what pychecker_ provides, especially since pychecker explicitely +different from what pychecker_ provides, especially since pychecker explicitly does not bother with coding style. The default coding style used by pylint is close to `PEP 008`_ (aka `Guido's style guide`_). For more information about code smells, refer to Martin Fowler's `refactoring book`_ @@ -58,7 +58,7 @@ programmers. Installation ------------ -Dependancies +Dependencies '''''''''''' Pylint requires the latest `logilab-astng`_ and `logilab-common`_ packages. It should be compatible with any python version greater than @@ -85,7 +85,7 @@ Contributed RPM packages for pylint and logilab-common are available at ftp://ftp.nest.pld-linux.org/test. Pylint is also available in Gentoo, Fedora 4, Ubuntu, FreeBSD, Darwin -(and maybe other, if si drop us a note please!). +(and maybe others, if you know about more OSes, please drop us a note!). Source distribution installation @@ -95,7 +95,7 @@ directory and simply run :: python setup.py install -You'll have to install dependancies in a similar way. +You'll have to install dependencies in a similar way. Windows users may get valuable information about pylint installation on `this page`_. @@ -229,14 +229,14 @@ Example (extracted from a run of pylint on itself...): W: 74:searchall: Unreachable code W:171:FormatChecker.process_tokens: Redefining built-in (type) W:150:FormatChecker.process_tokens: Too many local variables (20/15) - W:150:FormatChecker.process_tokens: Too many branchs (13/12) + W:150:FormatChecker.process_tokens: Too many branches (13/12) Reports section ''''''''''''''' Following the analysis message, pylint will display a set of reports, each one focusing on a particular aspect of the project, such as number -of messages by categories, modules dependancies... +of messages by categories, modules dependencies... For instance, the metrics report displays summaries gathered from the current run. @@ -247,7 +247,7 @@ current run. * percentage of classes, functions and modules with docstrings, and a comparison from the previous run * percentage of classes, functions and modules with correct name - (according the the coding standard), and a comparison from the + (according to the coding standard), and a comparison from the previous run * a list of external dependencies found in the code, and where they appear @@ -314,11 +314,11 @@ python makes it hard enough, it is not the case for warnings. :Quoting Alexandre: My usage pattern for pylint is to generally run pylint -e quite often to get stupid errors flagged before launching an application (or before - comitting). I generally run pylint with all the bells and whistles + committing). I generally run pylint with all the bells and whistles activated some time before a release, when I want to cleanup the code. And when I do that I simply ignore tons of the false warnings (and I can do that without being driven mad by this dumb program which is not - smart enough to understand the dynamicity of Python because I only run + smart enough to understand the dynamically of Python because I only run it once or twice a week in this mode) :Quoting Marteen Ter Huurne: @@ -356,7 +356,7 @@ You can check for already reported bugs, planned features on pylint's tracker web page: http://www.logilab.org/project/name/pylint Notice that if you don't find something you have expected in pylint's -tracker page, it may be on the tracker page of one of its dependancies, namely +tracker page, it may be on the tracker page of one of its dependencies, namely astng and common: * http://www.logilab.org/project/name/logilab-astng @@ -553,7 +553,7 @@ ask for any information on the python-projects mailing list. Contribute ! ------------ -All our software is developped using the mercurial_ version control +All our software is developed using the mercurial_ version control system. This is a very cool distributed vcs and its usage is very similar to other ones such as cvs or subversion (though the distributed feature introduced some different usage patterns). See mercurial home page for installation on @@ -565,7 +565,7 @@ repository: http://www.logilab.org/src/pylint -The same is true for pylint dependancies (if you use pylint code from the +The same is true for pylint dependencies (if you use pylint code from the repository, you should usually use code from the repository as well for astng and common): diff --git a/doc/quickstart.txt b/doc/quickstart.txt index 61a0e54..1915678 100644 --- a/doc/quickstart.txt +++ b/doc/quickstart.txt @@ -124,7 +124,7 @@ Example (extracted from a run of pylint on itself...): W: 74:searchall: Unreachable code W:171:FormatChecker.process_tokens: Redefining built-in (type) W:150:FormatChecker.process_tokens: Too many local variables (20/15) - W:150:FormatChecker.process_tokens: Too many branchs (13/12) + W:150:FormatChecker.process_tokens: Too many branches (13/12) Reports section @@ -132,7 +132,7 @@ Reports section Following the analysis message, pylint will display a set of reports, each one focusing on a particular aspect of the project, such as number -of messages by categories, modules dependancies... +of messages by categories, modules dependencies... For instance, the metrics report displays summaries gathered from the current run. @@ -143,7 +143,7 @@ current run. * percentage of classes, functions and modules with docstrings, and a comparison from the previous run * percentage of classes, functions and modules with correct name - (according the the coding standard), and a comparison from the + (according to the coding standard), and a comparison from the previous run * a list of external dependencies found in the code, and where they appear @@ -20,7 +20,7 @@ For example: cd a/c; pylint y.py - - THe following obviously doesn't + - The following obviously doesn't pylint a/c/y.py diff --git a/examples/pylintrc b/examples/pylintrc index 6ed593f..b863456 100644 --- a/examples/pylintrc +++ b/examples/pylintrc @@ -70,12 +70,12 @@ include-ids=no # written in a file name "pylint_global.[txt|html]". files-output=no -# Tells wether to display a full report or only the messages +# Tells whether to display a full report or only the messages reports=yes # Python expression which should return a note less than 10 (10 is the highest # note). You have access to the variables errors warning, statement which -# respectivly contain the number of errors / warnings messages and the total +# respectively contain the number of errors / warnings messages and the total # number of statements analyzed. This is used by the global evaluation report # (R0004). evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) @@ -95,12 +95,12 @@ comment=no # [TYPECHECK] -# Tells wether missing members accessed in mixin class should be ignored. A +# Tells whether missing members accessed in mixin class should be ignored. A # mixin class is detected if its name ends with "mixin" (case insensitive). ignore-mixin-members=yes # List of classes names for which member attributes should not be checked -# (useful for classes with attributes dynamicaly set). +# (useful for classes with attributes dynamically set). ignored-classes=SQLObject # When zope mode is activated, add a predefined set of Zope acquired attributes @@ -116,11 +116,11 @@ generated-members=REQUEST,acl_users,aq_parent # * unused variables / imports # * undefined variables # * redefinition of variable from builtins or from an outer scope -# * use of variable before assigment +# * use of variable before assignment # [VARIABLES] -# Tells wether we should check for unused import in __init__ files. +# Tells whether we should check for unused import in __init__ files. init-import=no # A regular expression matching names used for dummy variables (i.e. not used). @@ -134,7 +134,7 @@ additional-builtins= # checks for : # * doc strings # * modules / classes / functions / methods / arguments / variables name -# * number of arguments, local variables, branchs, returns and statements in +# * number of arguments, local variables, branches, returns and statements in # functions, methods # * required module attributes # * dangerous default values as arguments @@ -225,7 +225,7 @@ max-public-methods=20 # checks for : # * methods without self as first argument # * overridden methods signature -# * access only to existant members via self +# * access only to existent members via self # * attributes not defined in the __init__ method # * supported interfaces implementation # * unreachable code @@ -44,7 +44,7 @@ class LintGui: self.txtModule.focus_set() def mainloop(self): - """lauch the mainloop of the application""" + """launch the mainloop of the application""" self.root.mainloop() def quit(self, _=None): @@ -52,7 +52,7 @@ class LintGui: self.root.quit() def run_lint(self, _=None): - """lauches pylint""" + """launches pylint""" colors = {'W:':'red1', 'E:': 'red4', 'W:': 'red3', '**': 'navy'} diff --git a/interfaces.py b/interfaces.py index 9771aaf..7bbf34e 100644 --- a/interfaces.py +++ b/interfaces.py @@ -60,7 +60,7 @@ class ILinter(Interface): """interface for the linter class the linter class will generate events to its registered checkers. - Each ckecker may interact with the linter instance using this API + Each checker may interact with the linter instance using this API """ def register_checker(self, checker): @@ -70,18 +70,18 @@ REPORTER_OPT_MAP = {'text': TextReporter, MSGS = { 'F0001': ('%s', - 'Used when an error occured preventing the analysis of a \ + 'Used when an error occurred preventing the analysis of a \ module (unable to find it for instance).'), 'F0002': ('%s: %s', - 'Used when an unexpected error occured while building the ASTNG \ + 'Used when an unexpected error occurred while building the ASTNG \ representation. This is usually accompanied by a traceback. \ Please report such errors !'), 'F0003': ('ignored builtin module %s', 'Used to indicate that the user asked to analyze a builtin module\ which has been skipped.'), - 'F0004': ('unexpected infered value %s', + 'F0004': ('unexpected inferred value %s', 'Used to indicate that some value of an unexpected type has been \ - infered.'), + inferred.'), 'I0001': ('Unable to run raw checkers on built-in module %s', 'Used to inform that a built-in module has not been checked \ @@ -185,7 +185,7 @@ Reports (if any) will be written in a file name "pylint_global.[txt|html]".'}), {'default': 1, 'type' : 'yn', 'metavar' : '<y_or_n>', 'short': 'r', 'group': 'Reports', - 'help' : 'Tells wether to display a full report or only the\ + 'help' : 'Tells whether to display a full report or only the\ messages'}), ('evaluation', @@ -195,7 +195,7 @@ Reports (if any) will be written in a file name "pylint_global.[txt|html]".'}), convention) / statement) * 10)', 'help' : 'Python expression which should return a note less \ than 10 (10 is the highest note). You have access to the variables errors \ -warning, statement which respectivly contain the number of errors / warnings\ +warning, statement which respectively contain the number of errors / warnings\ messages and the total number of statements analyzed. This is used by the \ global evaluation report (R0004).'}), @@ -430,7 +430,7 @@ This is used by the global evaluation report (R0004).'}), self.collect_block_lines(child, msg_state) first = node.fromlineno last = node.tolineno - # first child line number used to distinguate between disable-msg + # first child line number used to distinguish between disable-msg # which are the first child of scoped node with those defined later. # For instance in the code below: # @@ -635,7 +635,7 @@ This is used by the global evaluation report (R0004).'}), try: note = eval(evaluation, {}, self.stats) except Exception, ex: - msg = 'An exception occured while rating: %s' % ex + msg = 'An exception occurred while rating: %s' % ex else: stats['global_note'] = note msg = 'Your code has been rated at %.2f/10' % note @@ -665,7 +665,7 @@ def report_messages_stats(sect, stats, _): if not msg_id.startswith('I')] in_order.sort() in_order.reverse() - lines = ('message id', 'occurences') + lines = ('message id', 'occurrences') for value, msg_id in in_order: lines += (msg_id, str(value)) sect.append(Table(children=lines, cols=2, rheaders=1)) @@ -831,7 +831,7 @@ There are 5 kind of message types : * (R) refactor, for bad code smell * (W) warning, for python specific problems * (E) error, for probable bugs in the code - * (F) fatal, if an error occured which prevented pylint from doing further + * (F) fatal, if an error occurred which prevented pylint from doing further processing. ''') linter.add_help_section('Output status code', ''' @@ -859,7 +859,7 @@ been issued by analysing pylint output status code # provide options) have been registered linter.load_config_file() if reporter: - # if a custom reporter is provided as argument, it may be overriden + # if a custom reporter is provided as argument, it may be overridden # by file parameters, so re-set it here, but before command line # parsing so it's still overrideable by command line option linter.set_reporter(reporter) @@ -886,11 +886,11 @@ been issued by analysing pylint output status code sys.exit(self.linter.msg_status) def cb_set_rcfile(self, name, value): - """callback for option preprocessing (ie before optik parsing)""" + """callback for option preprocessing (i.e. before optik parsing)""" self._rcfile = value def cb_add_plugins(self, name, value): - """callback for option preprocessing (ie before optik parsing)""" + """callback for option preprocessing (i.e. before optik parsing)""" self._plugins.extend(splitstrip(value)) def cb_error_mode(self, *args, **kwargs): diff --git a/man/pylint.1 b/man/pylint.1 index 2f11de9..0d5e8fc 100644 --- a/man/pylint.1 +++ b/man/pylint.1 @@ -82,9 +82,9 @@ Include message's id in output [current: no] .IP "--files-output=<y_or_n>" Put messages in a separate file for each module / package specified on the command line instead of printing them on stdout. Reports (if any) will be written in a file name "pylint_global.[txt|html]". [current: no] .IP "--reports=<y_or_n>, -r <y_or_n>" -Tells wether to display a full report or only the messages [current: yes] +Tells whether to display a full report or only the messages [current: yes] .IP "--evaluation=<python_expression>" -Python expression which should return a note less than 10 (10 is the highest note). You have access to the variables errors warning, statement which respectivly contain the number of errors / warnings messages and the total number of statements analyzed. This is used by the global evaluation report (R0004). [current: 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)] +Python expression which should return a note less than 10 (10 is the highest note). You have access to the variables errors warning, statement which respectively contain the number of errors / warnings messages and the total number of statements analyzed. This is used by the global evaluation report (R0004). [current: 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)] .IP "--comment=<y_or_n>" Add a comment according to your evaluation note. This is used by the global evaluation report (R0004). [current: no] .IP "--enable-report=<rpt ids>" @@ -146,9 +146,9 @@ Ignore docstrings when computing similarities. [current: yes] .SH TYPECHECK .IP "--ignore-mixin-members=<y_or_n>" -Tells wether missing members accessed in mixin class should be ignored. A mixin class is detected if its name ends with "mixin" (case insensitive). [current: yes] +Tells whether missing members accessed in mixin class should be ignored. A mixin class is detected if its name ends with "mixin" (case insensitive). [current: yes] .IP "--ignored-classes=<members names>" -List of classes names for which member attributes should not be checked (useful for classes with attributes dynamicaly set). [current: SQLObject] +List of classes names for which member attributes should not be checked (useful for classes with attributes dynamically set). [current: SQLObject] .IP "--zope=<y_or_n>" When zope mode is activated, add a predefined set of Zope acquired attributes to generated-members. [current: no] .IP "--generated-members=<members names>" @@ -156,7 +156,7 @@ List of members which are set dynamically and missed by pylint inference system, .SH VARIABLES .IP "--init-import=<y_or_n>" -Tells wether we should check for unused import in __init__ files. [current: no] +Tells whether we should check for unused import in __init__ files. [current: no] .IP "--dummy-variables-rgx=<regexp>" A regular expression matching names used for dummy variables (i.e. not used). [current: _|dummy] .IP "--additional-builtins=<comma separated list>" @@ -205,7 +205,7 @@ found, it defaults to ~/.pylint.d/ or .pylint.d (in the current working directory) . The current PYLINTHOME is ~/.pylint.d. * PYLINTRC path to the configuration file. If not found, it will use the first -existant file in ~/.pylintrc, /etc/pylintrc. The current PYLINTRC is +existent file in ~/.pylintrc, /etc/pylintrc. The current PYLINTRC is None. .SH OUTPUT @@ -217,7 +217,7 @@ There are 5 kind of message types : * (R) refactor, for bad code smell * (W) warning, for python specific problems * (E) error, for probable bugs in the code - * (F) fatal, if an error occured which prevented pylint from doing further processing. + * (F) fatal, if an error occurred which prevented pylint from doing further processing. .SH SEE ALSO /usr/share/doc/pylint/ diff --git a/man/pyreverse.1 b/man/pyreverse.1 index 8fa24b6..f250dc4 100644 --- a/man/pyreverse.1 +++ b/man/pyreverse.1 @@ -62,7 +62,7 @@ show all ancestors off all classes in <projects> [current: none] .IP -s <ass_level>, --show-associated=<associated> show <ass_level> associated classes. <ass_level>=1 will only take classes directly related to the classes in the project, while <ass_level>=2 -will also take all classes related to those fecthed by<depth>=1. +will also take all classes related to those fetched by<depth>=1. .IP -S, --all-associated=[yn] show recursively all associated off all associated classes [current: none] diff --git a/pyreverse/diadefslib.py b/pyreverse/diadefslib.py index 48e9f91..37f8321 100644 --- a/pyreverse/diadefslib.py +++ b/pyreverse/diadefslib.py @@ -41,7 +41,7 @@ class DiaDefGenerator: return title def _set_option(self, option): - """activate some options if not explicitely desactivated""" + """activate some options if not explicitly deactivated""" # if we have a class diagram, we want more information by default; # so if the option is None, we return True if option is None: diff --git a/pyreverse/diagrams.py b/pyreverse/diagrams.py index 32a4640..c8f41ad 100644 --- a/pyreverse/diagrams.py +++ b/pyreverse/diagrams.py @@ -42,7 +42,7 @@ class Relationship(Figure): class DiagramEntity(Figure): - """a diagram object, ie a label associated to an astng node + """a diagram object, i.e. a label associated to an astng node """ def __init__(self, title='No name', node=None): Figure.__init__(self) @@ -78,7 +78,7 @@ class ClassDiagram(Figure, FilterMixIn): raise KeyError(relation_type) def get_attrs(self, node): - """return visible attributs, possibly with class name""" + """return visible attributes, possibly with class name""" attrs = [] for node_name, ass_nodes in node.instance_attrs_type.items(): if not self.show_attr(node_name): @@ -135,7 +135,7 @@ class ClassDiagram(Figure, FilterMixIn): return [o for o in self.objects if isinstance(o.node, astng.Class)] def classe(self, name): - """return a klass by its name, raise KeyError if not found + """return a class by its name, raise KeyError if not found """ for klass in self.classes(): if klass.node.name == name: diff --git a/pyreverse/main.py b/pyreverse/main.py index e7e6ce4..bf39413 100644 --- a/pyreverse/main.py +++ b/pyreverse/main.py @@ -99,7 +99,7 @@ class PyreverseCommand(ConfigurationMixIn): self.run(args) def run(self, args): - """checking argmuents and run project""" + """checking arguments and run project""" if not args: print self.help() return diff --git a/test/input/func_block_disable_msg.py b/test/input/func_block_disable_msg.py index 5253411..354dff0 100644 --- a/test/input/func_block_disable_msg.py +++ b/test/input/func_block_disable_msg.py @@ -102,7 +102,7 @@ class Foo(object): print self.blip class ClassLevelMessage(object): - """should'nt display to much attributes/not enough methods messages + """shouldn't display to much attributes/not enough methods messages """ # pylint: disable-msg=R0902,R0903 @@ -119,7 +119,7 @@ class ClassLevelMessage(object): self.attr0 = 1 def too_complex_but_thats_ok(self, attr1, attr2): - """THIS Method has too much branchs and returns but i don't care + """THIS Method has too much branches and returns but i don't care """ # pylint: disable-msg=R0912,R0911 try: diff --git a/test/test_func.py b/test/test_func.py index e0d2581..a86fa5f 100644 --- a/test/test_func.py +++ b/test/test_func.py @@ -161,12 +161,12 @@ def make_tests(filter_rgx): if not is_to_run(module_file): continue base = module_file.replace('func_', '').replace('.py', '') - dependancies = get_tests_info(base, '.py') + dependencies = get_tests_info(base, '.py') class LintTestUsingModuleTC(LintTestUsingModule): module = module_file.replace('.py', '') output = messages_file - depends = dependancies or None + depends = dependencies or None tests.append(LintTestUsingModuleTC) if MODULES_ONLY: @@ -175,7 +175,7 @@ def make_tests(filter_rgx): class LintTestUsingFileTC(LintTestUsingFile): module = module_file.replace('.py', '') output = exists(messages_file + '2') and (messages_file + '2') or messages_file - depends = dependancies or None + depends = dependencies or None tests.append(LintTestUsingFileTC) ## # special test for f0003 @@ -183,7 +183,7 @@ def make_tests(filter_rgx): ## class LintTestSubclass(LintTest): ## module = module_file.replace('.pyc', '') ## output = messages_file -## depends = dependancies or None +## depends = dependencies or None ## tests.append(LintTestSubclass) class LintBuiltinModuleTest(LintTestUsingModule): diff --git a/test/test_regr.py b/test/test_regr.py index 5aa3665..8f2f0c2 100644 --- a/test/test_regr.py +++ b/test/test_regr.py @@ -14,7 +14,7 @@ # this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """non regression tests for pylint, which requires a too specific configuration -to be incorporated in the automatic functionnal test framework +to be incorporated in the automatic functional test framework """ import sys |