diff options
| -rw-r--r-- | doc/performance.txt | 2 | ||||
| -rw-r--r-- | doc/tutorial.txt | 4 | ||||
| -rw-r--r-- | src/lxml/builder.py | 4 | ||||
| -rw-r--r-- | src/lxml/html/diff.py | 2 | ||||
| -rw-r--r-- | src/lxml/includes/xmlparser.pxd | 4 | ||||
| -rw-r--r-- | src/lxml/lxml.objectify.pyx | 2 | ||||
| -rw-r--r-- | test.py | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/doc/performance.txt b/doc/performance.txt index d71fba9e..1a0c9ad6 100644 --- a/doc/performance.txt +++ b/doc/performance.txt @@ -330,7 +330,7 @@ that compare the parser of libxml2 to some major Java based XML parsers. One deals with `event-driven parser performance`_, the other one presents `benchmark results comparing DOM parsers`_. Both comparisons suggest that libxml2's parser performance is largely -superiour to all commonly used Java parsers in almost all cases. Note +superior to all commonly used Java parsers in almost all cases. Note that the C parser benchmark results are based on xmlbench_, which uses a simpler setup for libxml2 than lxml does. diff --git a/doc/tutorial.txt b/doc/tutorial.txt index 5f68721d..fc9752d8 100644 --- a/doc/tutorial.txt +++ b/doc/tutorial.txt @@ -1298,7 +1298,7 @@ HTML: ... E.p("This is a paragraph with ", E.b("bold"), " text in it!"), ... E.p("This is another paragraph, with a", "\n ", ... E.a("link", href="http://www.python.org"), "."), - ... E.p("Here are some reservered characters: <spam&egg>."), + ... E.p("Here are some reserved characters: <spam&egg>."), ... etree.XML("<p>And finally an embedded XHTML fragment.</p>"), ... ) ... ) @@ -1314,7 +1314,7 @@ HTML: <p>This is a paragraph with <b>bold</b> text in it!</p> <p>This is another paragraph, with a <a href="http://www.python.org">link</a>.</p> - <p>Here are some reservered characters: <spam&egg>.</p> + <p>Here are some reserved characters: <spam&egg>.</p> <p>And finally an embedded XHTML fragment.</p> </body> </html> diff --git a/src/lxml/builder.py b/src/lxml/builder.py index 87cd3818..1d41b1ad 100644 --- a/src/lxml/builder.py +++ b/src/lxml/builder.py @@ -106,7 +106,7 @@ class ElementMaker(object): E.p("This is a paragraph with ", B("bold"), " text in it!"), E.p("This is another paragraph, with a ", A("link", href="http://www.python.org"), "."), - E.p("Here are some reservered characters: <spam&egg>."), + E.p("Here are some reserved characters: <spam&egg>."), ET.XML("<p>And finally, here is an embedded XHTML fragment.</p>"), ) ) @@ -124,7 +124,7 @@ class ElementMaker(object): <h1 class="title">Hello!</h1> <p>This is a paragraph with <b>bold</b> text in it!</p> <p>This is another paragraph, with <a href="http://www.python.org">link</a>.</p> - <p>Here are some reservered characters: <spam&egg>.</p> + <p>Here are some reserved characters: <spam&egg>.</p> <p>And finally, here is an embedded XHTML fragment.</p> </body> </html> diff --git a/src/lxml/html/diff.py b/src/lxml/html/diff.py index c6a62c67..3126d965 100644 --- a/src/lxml/html/diff.py +++ b/src/lxml/html/diff.py @@ -382,7 +382,7 @@ def locate_unbalanced_start(unbalanced_start, pre_delete, post_delete): """ while 1: if not unbalanced_start: - # We have totally succeded in finding the position + # We have totally succeeded in finding the position break finding = unbalanced_start[0] finding_name = finding.split()[0].strip('<>') diff --git a/src/lxml/includes/xmlparser.pxd b/src/lxml/includes/xmlparser.pxd index 187b079f..a196e34b 100644 --- a/src/lxml/includes/xmlparser.pxd +++ b/src/lxml/includes/xmlparser.pxd @@ -161,9 +161,9 @@ cdef extern from "libxml/parser.h": XML_PARSE_PEDANTIC = 128 # pedantic error reporting XML_PARSE_NOBLANKS = 256 # remove blank nodes XML_PARSE_SAX1 = 512 # use the SAX1 interface internally - XML_PARSE_XINCLUDE = 1024 # Implement XInclude substitition + XML_PARSE_XINCLUDE = 1024 # Implement XInclude substitution XML_PARSE_NONET = 2048 # Forbid network access - XML_PARSE_NODICT = 4096 # Do not reuse the context dictionnary + XML_PARSE_NODICT = 4096 # Do not reuse the context dictionary XML_PARSE_NSCLEAN = 8192 # remove redundant namespaces declarations XML_PARSE_NOCDATA = 16384 # merge CDATA as text nodes XML_PARSE_NOXINCNODE = 32768 # do not generate XINCLUDE START/END nodes diff --git a/src/lxml/lxml.objectify.pyx b/src/lxml/lxml.objectify.pyx index 83c4e617..a4cf19d0 100644 --- a/src/lxml/lxml.objectify.pyx +++ b/src/lxml/lxml.objectify.pyx @@ -1383,7 +1383,7 @@ cdef class ObjectifyElementClassLookup(ElementClassLookup): ObjectifiedElement and ObjectifiedDataElement as keyword arguments. 'tree_class' defines inner tree classes (defaults to ObjectifiedElement), 'empty_data_class' defines the default class for - empty data elements (defauls to StringElement). + empty data elements (defaults to StringElement). """ self._lookup_function = _lookupElementClass if tree_class is None: @@ -25,7 +25,7 @@ Syntax: test.py [options] [pathname-regexp [test-regexp]] There are two kinds of tests: - unit tests (or programmer tests) test the internal workings of various components of the system - - functional tests (acceptance tests, customer tests) test only externaly + - functional tests (acceptance tests, customer tests) test only externally visible system behaviour You can choose to run unit tests (this is the default mode), functional tests |