[Python-modules-commits] [pyparsing] 01/03: Import pyparsing_2.1.9+dfsg1.orig.tar.gz

Barry Warsaw barry at moszumanska.debian.org
Wed Sep 21 16:11:45 UTC 2016


This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository pyparsing.

commit 0b9267dbbf5d03791a23e84d9ba45f3557641346
Author: Barry Warsaw <barry at python.org>
Date:   Wed Sep 21 11:52:51 2016 -0400

    Import pyparsing_2.1.9+dfsg1.orig.tar.gz
---
 CHANGES                                            |    54 +-
 PKG-INFO                                           |     2 +-
 examples/excelExpr.py                              |     9 +-
 examples/select_parser.py                          |     2 +-
 htmldoc/api-objects.txt                            |    88 +-
 htmldoc/class-tree.html                            |     8 +-
 htmldoc/help.html                                  |     2 +-
 htmldoc/identifier-index.html                      |   248 +-
 htmldoc/module-tree.html                           |     2 +-
 htmldoc/pyparsing-module.html                      |   137 +-
 htmldoc/pyparsing-pysrc.html                       | 11407 ++++++++++---------
 htmldoc/pyparsing.And-class.html                   |     2 +-
 htmldoc/pyparsing.CaselessKeyword-class.html       |     6 +-
 htmldoc/pyparsing.CaselessLiteral-class.html       |     2 +-
 htmldoc/pyparsing.CharsNotIn-class.html            |     2 +-
 ...-class.html => pyparsing.CloseMatch-class.html} |    92 +-
 htmldoc/pyparsing.Combine-class.html               |     2 +-
 htmldoc/pyparsing.Dict-class.html                  |     2 +-
 htmldoc/pyparsing.Each-class.html                  |     2 +-
 htmldoc/pyparsing.Empty-class.html                 |     2 +-
 htmldoc/pyparsing.FollowedBy-class.html            |     2 +-
 htmldoc/pyparsing.Forward-class.html               |     2 +-
 htmldoc/pyparsing.GoToColumn-class.html            |     2 +-
 htmldoc/pyparsing.Group-class.html                 |     2 +-
 htmldoc/pyparsing.Keyword-class.html               |     6 +-
 htmldoc/pyparsing.LineEnd-class.html               |     2 +-
 htmldoc/pyparsing.LineStart-class.html             |     2 +-
 htmldoc/pyparsing.Literal-class.html               |     2 +-
 htmldoc/pyparsing.MatchFirst-class.html            |     2 +-
 htmldoc/pyparsing.NoMatch-class.html               |     2 +-
 htmldoc/pyparsing.NotAny-class.html                |     2 +-
 htmldoc/pyparsing.OneOrMore-class.html             |     2 +-
 htmldoc/pyparsing.OnlyOnce-class.html              |     2 +-
 htmldoc/pyparsing.Optional-class.html              |     2 +-
 htmldoc/pyparsing.Or-class.html                    |     2 +-
 htmldoc/pyparsing.ParseBaseException-class.html    |     2 +-
 htmldoc/pyparsing.ParseElementEnhance-class.html   |     2 +-
 htmldoc/pyparsing.ParseException-class.html        |     2 +-
 htmldoc/pyparsing.ParseExpression-class.html       |     2 +-
 htmldoc/pyparsing.ParseFatalException-class.html   |     2 +-
 htmldoc/pyparsing.ParseResults-class.html          |     3 +-
 htmldoc/pyparsing.ParseSyntaxException-class.html  |     2 +-
 htmldoc/pyparsing.ParserElement-class.html         |    62 +-
 htmldoc/pyparsing.QuotedString-class.html          |     2 +-
 .../pyparsing.RecursiveGrammarException-class.html |     2 +-
 htmldoc/pyparsing.Regex-class.html                 |     4 +-
 htmldoc/pyparsing.Regex.compiledREtype-class.html  |     2 +-
 htmldoc/pyparsing.SkipTo-class.html                |     2 +-
 htmldoc/pyparsing.StringEnd-class.html             |     2 +-
 htmldoc/pyparsing.StringStart-class.html           |     2 +-
 htmldoc/pyparsing.Suppress-class.html              |     2 +-
 htmldoc/pyparsing.Token-class.html                 |     4 +-
 htmldoc/pyparsing.TokenConverter-class.html        |     2 +-
 htmldoc/pyparsing.White-class.html                 |     9 +-
 htmldoc/pyparsing.Word-class.html                  |     2 +-
 htmldoc/pyparsing.WordEnd-class.html               |     2 +-
 htmldoc/pyparsing.WordStart-class.html             |     2 +-
 htmldoc/pyparsing.ZeroOrMore-class.html            |     2 +-
 htmldoc/pyparsing.pyparsing_common-class.html      |    67 +-
 htmldoc/redirect.html                              |     2 +-
 htmldoc/toc-everything.html                        |     3 +-
 htmldoc/toc-pyparsing-module.html                  |     3 +-
 pyparsing.egg-info/PKG-INFO                        |     2 +-
 pyparsing.egg-info/SOURCES.txt                     |     1 +
 pyparsing.py                                       |   158 +-
 65 files changed, 6566 insertions(+), 5893 deletions(-)

diff --git a/CHANGES b/CHANGES
index c2156cc..5689d53 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,50 @@
 Change Log
 ==========
 
-Version 2.1.8 - 
-------------------------------
+Version 2.1.9 - September, 2016
+-------------------------------
+- Added class CloseMatch, a variation on Literal which matches 
+  "close" matches, that is, strings with at most 'n' mismatching
+  characters.
+
+- Fixed bug in Keyword.setDefaultKeywordChars(), reported by Kobayashi
+  Shinji - nice catch, thanks!
+
+- Minor API change in pyparsing_common. Renamed some of the common
+  expressions to PEP8 format (to be consistent with the other 
+  pyparsing_common expressions):
+  . signedInteger -> signed_integer
+  . sciReal -> sci_real
+  
+  Also, in trying to stem the API bloat of pyparsing, I've copied
+  some of the global expressions and helper parse actions into 
+  pyparsing_common, with the originals to be deprecated and removed
+  in a future release:
+  . commaSeparatedList -> pyparsing_common.comma_separated_list
+  . upcaseTokens -> pyparsing_common.upcaseTokens
+  . downcaseTokens -> pyparsing_common.downcaseTokens
+
+  (I don't expect any other expressions, like the comment expressions,
+  quotedString, or the Word-helping strings like alphas, nums, etc.
+  to migrate to pyparsing_common - they are just too pervasive. As for
+  the PEP8 vs camelCase naming, all the expressions are PEP8, while
+  the parse actions in pyparsing_common are still camelCase. It's a 
+  small step - when pyparsing 3.0 comes around, everything will change
+  to PEP8 snake case.)
+
+- Fixed Python3 compatibility bug when using dict keys() and values()
+  in ParseResults.getName().
+
+- After some prodding, I've reworked the unitTests.py file for 
+  pyparsing over the past few releases. It uses some variations on 
+  unittest to handle my testing style. The test now:
+  . auto-discovers its test classes (while maintining their order
+    of definition)
+  . suppresses voluminous 'print' output for tests that pass
+
+
+Version 2.1.8 - August, 2016
+----------------------------
 - Fixed issue in the optimization to _trim_arity, when the full 
   stacktrace is retrieved to determine if a TypeError is raised in
   pyparsing or in the caller's parse action. Code was traversing
@@ -22,8 +64,8 @@ Version 2.1.8 -
 - Improved use of runTests in several example scripts.
 
 
-Version 2.1.7 - 
-------------------------------
+Version 2.1.7 - August, 2016
+----------------------------
 - Fixed regression reported by Andrea Censi (surfaced in PyContracts 
   tests) when using ParseSyntaxExceptions (raised when using operator '-')
   with packrat parsing.
@@ -34,8 +76,8 @@ Version 2.1.7 -
   oneOf will accept the list or set or generator directly.)
 
 
-Version 2.1.6 - 
-------------------------------
+Version 2.1.6 - August, 2016
+----------------------------
 - *Major packrat upgrade*, inspired by patch provided by Tal Einat - 
   many, many, thanks to Tal for working on this! Tal's tests show 
   faster parsing performance (2X in some tests), *and* memory reduction 
diff --git a/PKG-INFO b/PKG-INFO
index 117a8a3..b0e19f8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyparsing
-Version: 2.1.8
+Version: 2.1.9
 Summary: Python parsing module
 Home-page: http://pyparsing.wikispaces.com/
 Author: Paul McGuire
diff --git a/examples/excelExpr.py b/examples/excelExpr.py
index b98115e..7ce8db2 100644
--- a/examples/excelExpr.py
+++ b/examples/excelExpr.py
@@ -7,10 +7,10 @@
 from pyparsing import (CaselessKeyword, Suppress, Word, alphas, 
     alphanums, nums, Optional, Group, oneOf, Forward, Regex, 
     infixNotation, opAssoc, dblQuotedString, delimitedList, 
-    Combine, Literal, QuotedString, ParserElement)
+    Combine, Literal, QuotedString, ParserElement, pyparsing_common)
 ParserElement.enablePackrat()
 
-EQ,EXCL,LPAR,RPAR,COLON,COMMA = map(Suppress, '=!():,')
+EQ,LPAR,RPAR,COLON,COMMA = map(Suppress, '=():,')
 EXCL, DOLLAR = map(Literal,"!$")
 sheetRef = Word(alphas, alphanums) | QuotedString("'",escQuote="''")
 colRef = Optional(DOLLAR) + Word(alphas,max=2)
@@ -26,7 +26,7 @@ expr = Forward()
 COMPARISON_OP = oneOf("< = > >= <= != <>")
 condExpr = expr + COMPARISON_OP + expr
 
-ifFunc = (CaselessKeyword("if") + 
+ifFunc = (CaselessKeyword("if") - 
           LPAR + 
           Group(condExpr)("condition") + 
           COMMA + Group(expr)("if_true") + 
@@ -41,7 +41,7 @@ funcCall = ifFunc | sumFunc | minFunc | maxFunc | aveFunc
 
 multOp = oneOf("* /")
 addOp = oneOf("+ -")
-numericLiteral = Regex(r"\-?\d+(\.\d+)?")
+numericLiteral = pyparsing_common.number
 operand = numericLiteral | funcCall | cellRange | cellRef 
 arithExpr = infixNotation(operand,
     [
@@ -65,4 +65,5 @@ expr << (arithExpr | textExpr)
     =3*'O''Reilly''s sheet'!$A$7+5
     =if(Sum(A1:A25)>42,Min(B1:B25),if(Sum(C1:C25)>3.14, (Min(C1:C25)+3)*18,Max(B1:B25)))
     =sum(a1:a25,10,min(b1,c2,d3))
+    =if("T"&a2="TTime", "Ready", "Not ready")
 """)
\ No newline at end of file
diff --git a/examples/select_parser.py b/examples/select_parser.py
index da106ac..5b823a4 100644
--- a/examples/select_parser.py
+++ b/examples/select_parser.py
@@ -99,7 +99,7 @@ join_source << (Group(single_source + OneOrMore(join_op + single_source + join_c
 
 result_column = "*" | table_name + "." + "*" | Group(expr + Optional(Optional(AS) + column_alias))
 select_core = (SELECT + Optional(DISTINCT | ALL) + Group(delimitedList(result_column))("columns") +
-                Optional(FROM + join_source("from")) +
+                Optional(FROM + join_source("from*")) +
                 Optional(WHERE + expr("where_expr")) +
                 Optional(GROUP + BY + Group(delimitedList(ordering_term)("group_by_terms")) + 
                         Optional(HAVING + expr("having_expr"))))
diff --git a/htmldoc/api-objects.txt b/htmldoc/api-objects.txt
index 8730ace..2e15096 100644
--- a/htmldoc/api-objects.txt
+++ b/htmldoc/api-objects.txt
@@ -368,6 +368,75 @@ pyparsing.ParserElement._parse	pyparsing.ParserElement-class.html#_parse
 pyparsing.ParserElement._skipIgnorables	pyparsing.ParserElement-class.html#_skipIgnorables
 pyparsing.ParserElement._literalStringClass	pyparsing.Literal-class.html
 pyparsing.ParserElement.verbose_stacktrace	pyparsing.ParserElement-class.html#verbose_stacktrace
+pyparsing.CloseMatch	pyparsing.CloseMatch-class.html
+pyparsing.ParserElement._parseCache	pyparsing.ParserElement-class.html#_parseCache
+pyparsing.ParserElement.__ror__	pyparsing.ParserElement-class.html#__ror__
+pyparsing.ParserElement.addParseAction	pyparsing.ParserElement-class.html#addParseAction
+pyparsing.ParserElement.resetCache	pyparsing.ParserElement-class.html#resetCache
+pyparsing.ParserElement.__radd__	pyparsing.ParserElement-class.html#__radd__
+pyparsing.ParserElement._parseNoCache	pyparsing.ParserElement-class.html#_parseNoCache
+pyparsing.ParserElement.__rmul__	pyparsing.ParserElement-class.html#__rmul__
+pyparsing.ParserElement.__rsub__	pyparsing.ParserElement-class.html#__rsub__
+pyparsing.ParserElement.inlineLiteralsUsing	pyparsing.ParserElement-class.html#inlineLiteralsUsing
+pyparsing.ParserElement.__and__	pyparsing.ParserElement-class.html#__and__
+pyparsing.CloseMatch.__init__	pyparsing.CloseMatch-class.html#__init__
+pyparsing.ParserElement.setFailAction	pyparsing.ParserElement-class.html#setFailAction
+pyparsing.ParserElement.transformString	pyparsing.ParserElement-class.html#transformString
+pyparsing.ParserElement.__rand__	pyparsing.ParserElement-class.html#__rand__
+pyparsing.ParserElement.parseString	pyparsing.ParserElement-class.html#parseString
+pyparsing.ParserElement.packrat_cache	pyparsing.ParserElement-class.html#packrat_cache
+pyparsing.ParserElement.__req__	pyparsing.ParserElement-class.html#__req__
+pyparsing.ParserElement.setDefaultWhitespaceChars	pyparsing.ParserElement-class.html#setDefaultWhitespaceChars
+pyparsing.ParserElement._packratEnabled	pyparsing.ParserElement-class.html#_packratEnabled
+pyparsing.CloseMatch.parseImpl	pyparsing.CloseMatch-class.html#parseImpl
+pyparsing.ParserElement.__invert__	pyparsing.ParserElement-class.html#__invert__
+pyparsing.ParserElement.packrat_cache_lock	pyparsing.ParserElement-class.html#packrat_cache_lock
+pyparsing.ParserElement.postParse	pyparsing.ParserElement-class.html#postParse
+pyparsing.ParserElement.__call__	pyparsing.ParserElement-class.html#__call__
+pyparsing.ParserElement.__str__	pyparsing.ParserElement-class.html#__str__
+pyparsing.ParserElement.setWhitespaceChars	pyparsing.ParserElement-class.html#setWhitespaceChars
+pyparsing.ParserElement.split	pyparsing.ParserElement-class.html#split
+pyparsing.ParserElement.__ne__	pyparsing.ParserElement-class.html#__ne__
+pyparsing.ParserElement.leaveWhitespace	pyparsing.ParserElement-class.html#leaveWhitespace
+pyparsing.ParserElement.setName	pyparsing.ParserElement-class.html#setName
+pyparsing.ParserElement.matches	pyparsing.ParserElement-class.html#matches
+pyparsing.ParserElement.suppress	pyparsing.ParserElement-class.html#suppress
+pyparsing.ParserElement.enablePackrat	pyparsing.ParserElement-class.html#enablePackrat
+pyparsing.ParserElement.packrat_cache_stats	pyparsing.ParserElement-class.html#packrat_cache_stats
+pyparsing.ParserElement.setResultsName	pyparsing.ParserElement-class.html#setResultsName
+pyparsing.ParserElement.parseFile	pyparsing.ParserElement-class.html#parseFile
+pyparsing.ParserElement.addCondition	pyparsing.ParserElement-class.html#addCondition
+pyparsing.ParserElement.canParseNext	pyparsing.ParserElement-class.html#canParseNext
+pyparsing.ParserElement.__or__	pyparsing.ParserElement-class.html#__or__
+pyparsing.ParserElement.__add__	pyparsing.ParserElement-class.html#__add__
+pyparsing.ParserElement.setParseAction	pyparsing.ParserElement-class.html#setParseAction
+pyparsing.ParserElement.tryParse	pyparsing.ParserElement-class.html#tryParse
+pyparsing.ParserElement.ignore	pyparsing.ParserElement-class.html#ignore
+pyparsing.ParserElement.validate	pyparsing.ParserElement-class.html#validate
+pyparsing.ParserElement.copy	pyparsing.ParserElement-class.html#copy
+pyparsing.ParserElement.__eq__	pyparsing.ParserElement-class.html#__eq__
+pyparsing.ParserElement.__rxor__	pyparsing.ParserElement-class.html#__rxor__
+pyparsing.ParserElement.runTests	pyparsing.ParserElement-class.html#runTests
+pyparsing.ParserElement.DEFAULT_WHITE_CHARS	pyparsing.ParserElement-class.html#DEFAULT_WHITE_CHARS
+pyparsing.ParserElement.parseWithTabs	pyparsing.ParserElement-class.html#parseWithTabs
+pyparsing.ParserElement.searchString	pyparsing.ParserElement-class.html#searchString
+pyparsing.ParserElement.scanString	pyparsing.ParserElement-class.html#scanString
+pyparsing.ParserElement.preParse	pyparsing.ParserElement-class.html#preParse
+pyparsing.ParserElement.setDebug	pyparsing.ParserElement-class.html#setDebug
+pyparsing.ParserElement.__rne__	pyparsing.ParserElement-class.html#__rne__
+pyparsing.ParserElement.setBreak	pyparsing.ParserElement-class.html#setBreak
+pyparsing.ParserElement.__xor__	pyparsing.ParserElement-class.html#__xor__
+pyparsing.ParserElement.setDebugActions	pyparsing.ParserElement-class.html#setDebugActions
+pyparsing.ParserElement.__mul__	pyparsing.ParserElement-class.html#__mul__
+pyparsing.ParserElement.streamline	pyparsing.ParserElement-class.html#streamline
+pyparsing.ParserElement.__repr__	pyparsing.ParserElement-class.html#__repr__
+pyparsing.ParserElement.checkRecursion	pyparsing.ParserElement-class.html#checkRecursion
+pyparsing.ParserElement.__hash__	pyparsing.ParserElement-class.html#__hash__
+pyparsing.ParserElement.__sub__	pyparsing.ParserElement-class.html#__sub__
+pyparsing.ParserElement._parse	pyparsing.ParserElement-class.html#_parse
+pyparsing.ParserElement._skipIgnorables	pyparsing.ParserElement-class.html#_skipIgnorables
+pyparsing.ParserElement._literalStringClass	pyparsing.Literal-class.html
+pyparsing.ParserElement.verbose_stacktrace	pyparsing.ParserElement-class.html#verbose_stacktrace
 pyparsing.Combine	pyparsing.Combine-class.html
 pyparsing.ParserElement._parseCache	pyparsing.ParserElement-class.html#_parseCache
 pyparsing.ParserElement.__ror__	pyparsing.ParserElement-class.html#__ror__
@@ -2508,7 +2577,7 @@ pyparsing.ParserElement.__and__	pyparsing.ParserElement-class.html#__and__
 pyparsing.White.__init__	pyparsing.White-class.html#__init__
 pyparsing.ParserElement.setFailAction	pyparsing.ParserElement-class.html#setFailAction
 pyparsing.ParserElement.transformString	pyparsing.ParserElement-class.html#transformString
-pyparsing.ParserElement.__rand__	pyparsing.ParserElement-class.html#__rand__
+pyparsing.White.__slotnames__	pyparsing.White-class.html#__slotnames__
 pyparsing.ParserElement.parseString	pyparsing.ParserElement-class.html#parseString
 pyparsing.ParserElement.packrat_cache	pyparsing.ParserElement-class.html#packrat_cache
 pyparsing.ParserElement.__req__	pyparsing.ParserElement-class.html#__req__
@@ -2525,6 +2594,7 @@ pyparsing.ParserElement.split	pyparsing.ParserElement-class.html#split
 pyparsing.ParserElement.__ne__	pyparsing.ParserElement-class.html#__ne__
 pyparsing.ParserElement.leaveWhitespace	pyparsing.ParserElement-class.html#leaveWhitespace
 pyparsing.ParserElement.setName	pyparsing.ParserElement-class.html#setName
+pyparsing.ParserElement.__rand__	pyparsing.ParserElement-class.html#__rand__
 pyparsing.ParserElement.matches	pyparsing.ParserElement-class.html#matches
 pyparsing.ParserElement.suppress	pyparsing.ParserElement-class.html#suppress
 pyparsing.ParserElement.enablePackrat	pyparsing.ParserElement-class.html#enablePackrat
@@ -2843,28 +2913,32 @@ pyparsing.ParserElement._literalStringClass	pyparsing.Literal-class.html
 pyparsing.ParserElement.verbose_stacktrace	pyparsing.ParserElement-class.html#verbose_stacktrace
 pyparsing.pyparsing_common	pyparsing.pyparsing_common-class.html
 pyparsing.pyparsing_common.fnumber	pyparsing.pyparsing_common-class.html#fnumber
+pyparsing.pyparsing_common.comma_separated_list	pyparsing.pyparsing_common-class.html#comma_separated_list
 pyparsing.pyparsing_common.stripHTMLTags	pyparsing.pyparsing_common-class.html#stripHTMLTags
+pyparsing.pyparsing_common._commasepitem	pyparsing.pyparsing_common-class.html#_commasepitem
 pyparsing.pyparsing_common._mixed_ipv6_address	pyparsing.pyparsing_common-class.html#_mixed_ipv6_address
 pyparsing.pyparsing_common.hex_integer	pyparsing.pyparsing_common-class.html#hex_integer
 pyparsing.pyparsing_common.number	pyparsing.pyparsing_common-class.html#number
-pyparsing.pyparsing_common.signedInteger	pyparsing.pyparsing_common-class.html#signedInteger
 pyparsing.pyparsing_common.convertToInteger	pyparsing.pyparsing_common-class.html#convertToInteger
+pyparsing.pyparsing_common.sci_real	pyparsing.pyparsing_common-class.html#sci_real
 pyparsing.pyparsing_common.uuid	pyparsing.pyparsing_common-class.html#uuid
 pyparsing.pyparsing_common.convertToFloat	pyparsing.pyparsing_common-class.html#convertToFloat
 pyparsing.pyparsing_common.convertToDate	pyparsing.pyparsing_common-class.html#convertToDate
+pyparsing.pyparsing_common.downcaseTokens	pyparsing.pyparsing_common-class.html#downcaseTokens
 pyparsing.pyparsing_common.convertToDatetime	pyparsing.pyparsing_common-class.html#convertToDatetime
 pyparsing.pyparsing_common.fraction	pyparsing.pyparsing_common-class.html#fraction
 pyparsing.pyparsing_common._full_ipv6_address	pyparsing.pyparsing_common-class.html#_full_ipv6_address
+pyparsing.pyparsing_common.signed_integer	pyparsing.pyparsing_common-class.html#signed_integer
 pyparsing.pyparsing_common.real	pyparsing.pyparsing_common-class.html#real
 pyparsing.pyparsing_common.mac_address	pyparsing.pyparsing_common-class.html#mac_address
 pyparsing.pyparsing_common.iso8601_date	pyparsing.pyparsing_common-class.html#iso8601_date
-pyparsing.pyparsing_common.iso8601_datetime	pyparsing.pyparsing_common-class.html#iso8601_datetime
+pyparsing.pyparsing_common.ipv4_address	pyparsing.pyparsing_common-class.html#ipv4_address
 pyparsing.pyparsing_common.integer	pyparsing.pyparsing_common-class.html#integer
 pyparsing.pyparsing_common._ipv6_part	pyparsing.pyparsing_common-class.html#_ipv6_part
-pyparsing.pyparsing_common.ipv4_address	pyparsing.pyparsing_common-class.html#ipv4_address
-pyparsing.pyparsing_common.mixed_integer	pyparsing.pyparsing_common-class.html#mixed_integer
+pyparsing.pyparsing_common.iso8601_datetime	pyparsing.pyparsing_common-class.html#iso8601_datetime
+pyparsing.pyparsing_common.identifier	pyparsing.pyparsing_common-class.html#identifier
+pyparsing.pyparsing_common.upcaseTokens	pyparsing.pyparsing_common-class.html#upcaseTokens
 pyparsing.pyparsing_common._short_ipv6_address	pyparsing.pyparsing_common-class.html#_short_ipv6_address
 pyparsing.pyparsing_common.ipv6_address	pyparsing.pyparsing_common-class.html#ipv6_address
-pyparsing.pyparsing_common.sciReal	pyparsing.pyparsing_common-class.html#sciReal
-pyparsing.pyparsing_common.identifier	pyparsing.pyparsing_common-class.html#identifier
+pyparsing.pyparsing_common.mixed_integer	pyparsing.pyparsing_common-class.html#mixed_integer
 pyparsing.pyparsing_common._html_stripper	pyparsing.pyparsing_common-class.html#_html_stripper
diff --git a/htmldoc/class-tree.html b/htmldoc/class-tree.html
index 30fb33e..12b4ef4 100644
--- a/htmldoc/class-tree.html
+++ b/htmldoc/class-tree.html
@@ -195,6 +195,12 @@
         given set (will include whitespace in matched characters if not 
         listed in the provided exclusion set - see example).</em>
     </li>
+    <li> <strong class="uidlink"><a href="pyparsing.CloseMatch-class.html">pyparsing.CloseMatch</a></strong>:
+      <em class="summary">A variation on <a href="pyparsing.Literal-class.html" class="link" 
+        onclick="show_private();">Literal</a> which matches 
+        "close" matches, that is, strings with at most 'n' 
+        mismatching characters.</em>
+    </li>
     <li> <strong class="uidlink"><a href="pyparsing.Empty-class.html">pyparsing.Empty</a></strong>:
       <em class="summary">An empty token, will always match.</em>
     <ul>
@@ -311,7 +317,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Sun Aug 14 16:58:53 2016
+    Generated by Epydoc 3.0.1 on Sat Sep 10 10:21:41 2016
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/htmldoc/help.html b/htmldoc/help.html
index 81241fa..9168067 100644
--- a/htmldoc/help.html
+++ b/htmldoc/help.html
@@ -254,7 +254,7 @@ page was last updated. </p>
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Sun Aug 14 16:58:53 2016
+    Generated by Epydoc 3.0.1 on Sat Sep 10 10:21:41 2016
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/htmldoc/identifier-index.html b/htmldoc/identifier-index.html
index 651bb83..7c77f60 100644
--- a/htmldoc/identifier-index.html
+++ b/htmldoc/identifier-index.html
@@ -138,78 +138,80 @@
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#clear">clear()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#copy">copy()</a><br />
-<span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#convertToFloat">convertToFloat()</a><br />
+<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.CaselessKeyword-class.html">CaselessKeyword</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#col">col()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.CloseMatch-class.html">CloseMatch</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Keyword-class.html#copy">copy()</a><br />
-<span class="index-where">(in <a href="pyparsing.Keyword-class.html">Keyword</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#convertToInteger">convertToInteger()</a><br />
+<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.CaselessLiteral-class.html">CaselessLiteral</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Combine-class.html">Combine</a><br />
+<td width="33%" class="link-index"><a href="pyparsing-module.html#col">col()</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParseExpression-class.html#copy">copy()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseExpression-class.html">ParseExpression</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#copy">copy()</a><br />
+<span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.CharsNotIn-class.html">CharsNotIn</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#commaSeparatedList">commaSeparatedList</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.Combine-class.html">Combine</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#copy">copy()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Keyword-class.html#copy">copy()</a><br />
+<span class="index-where">(in <a href="pyparsing.Keyword-class.html">Keyword</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.And-class.html#checkRecursion">checkRecursion()</a><br />
 <span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#commonHTMLEntity">commonHTMLEntity</a><br />
-<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#copy">copy()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#comma_separated_list">comma_separated_list</a><br />
+<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseExpression-class.html#copy">copy()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseExpression-class.html">ParseExpression</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Each-class.html#checkRecursion">checkRecursion()</a><br />
 <span class="index-where">(in <a href="pyparsing.Each-class.html">Each</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Regex.compiledREtype-class.html">compiledREtype</a><br />
-<span class="index-where">(in <a href="pyparsing.Regex-class.html">Regex</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#countedArray">countedArray()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing-module.html#commaSeparatedList">commaSeparatedList</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#copy">copy()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#checkRecursion">checkRecursion()</a><br />
 <span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#convertToDate">convertToDate()</a><br />
-<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#cppStyleComment">cppStyleComment</a><br />
+<td width="33%" class="link-index"><a href="pyparsing-module.html#commonHTMLEntity">commonHTMLEntity</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#copy">copy()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Or-class.html#checkRecursion">checkRecursion()</a><br />
 <span class="index-where">(in <a href="pyparsing.Or-class.html">Or</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#convertToDatetime">convertToDatetime()</a><br />
-<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#cStyleComment">cStyleComment</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.Regex.compiledREtype-class.html">compiledREtype</a><br />
+<span class="index-where">(in <a href="pyparsing.Regex-class.html">Regex</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing-module.html#countedArray">countedArray()</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParseElementEnhance-class.html#checkRecursion">checkRecursion()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseElementEnhance-class.html">ParseElementEnhance</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#convertToFloat">convertToFloat()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#convertToDate">convertToDate()</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
-<td width="33%" class="link-index"> </td>
+<td width="33%" class="link-index"><a href="pyparsing-module.html#cppStyleComment">cppStyleComment</a><br />
+<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#checkRecursion">checkRecursion()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#convertToInteger">convertToInteger()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#convertToDatetime">convertToDatetime()</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
-<td width="33%" class="link-index"> </td>
+<td width="33%" class="link-index"><a href="pyparsing-module.html#cStyleComment">cStyleComment</a><br />
+<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 </table>
 </td></tr>
@@ -219,26 +221,32 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#dblQuotedString">dblQuotedString</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#DEFAULT_WHITE_CHARS">DEFAULT_WHITE_CHARS</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#dictOf">dictOf()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing-module.html#delimitedList">delimitedList()</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#downcaseTokens">downcaseTokens()</a><br />
+<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#dblSlashComment">dblSlashComment</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#delimitedList">delimitedList()</a><br />
-<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#downcaseTokens">downcaseTokens()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.Dict-class.html">Dict</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#dump">dump()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Keyword-class.html#DEFAULT_KEYWORD_CHARS">DEFAULT_KEYWORD_CHARS</a><br />
 <span class="index-where">(in <a href="pyparsing.Keyword-class.html">Keyword</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Dict-class.html">Dict</a><br />
+<td width="33%" class="link-index"><a href="pyparsing-module.html#dictOf">dictOf()</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#dump">dump()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"> </td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#DEFAULT_WHITE_CHARS">DEFAULT_WHITE_CHARS</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing-module.html#downcaseTokens">downcaseTokens()</a><br />
+<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
+<td width="33%" class="link-index"> </td>
 </tr>
 </table>
 </td></tr>
@@ -527,13 +535,21 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#packrat_cache">packrat_cache</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Literal-class.html#parseImpl">parseImpl()</a><br />
+<span class="index-where">(in <a href="pyparsing.Literal-class.html" onclick="show_private();">Literal</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#parseString">parseString()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#packrat_cache_lock">packrat_cache_lock</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseSyntaxException-class.html">ParseSyntaxException</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#packrat_cache_lock">packrat_cache_lock</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#packrat_cache_stats">packrat_cache_stats</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.NoMatch-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.NoMatch-class.html">NoMatch</a>)</span></td>
@@ -541,15 +557,15 @@
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#packrat_cache_stats">packrat_cache_stats</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a><br />
+<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.NotAny-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.NotAny-class.html">NotAny</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Regex.compiledREtype-class.html#pattern">pattern</a><br />
 <span class="index-where">(in <a href="pyparsing.Regex.compiledREtype-class.html">compiledREtype</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParseElementEnhance-class.html">ParseElementEnhance</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Optional-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.Optional-class.html">Optional</a>)</span></td>
@@ -557,7 +573,7 @@
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseElementEnhance-class.html">ParseElementEnhance</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParseException-class.html">ParseException</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Or-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.Or-class.html">Or</a>)</span></td>
@@ -565,7 +581,7 @@
 <span class="index-where">(in <a href="pyparsing.Combine-class.html">Combine</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseException-class.html">ParseException</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParseExpression-class.html">ParseExpression</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseElementEnhance-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseElementEnhance-class.html">ParseElementEnhance</a>)</span></td>
@@ -573,7 +589,7 @@
 <span class="index-where">(in <a href="pyparsing.Dict-class.html">Dict</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseExpression-class.html">ParseExpression</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParseFatalException-class.html">ParseFatalException</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
@@ -581,48 +597,48 @@
 <span class="index-where">(in <a href="pyparsing.Group-class.html">Group</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseFatalException-class.html">ParseFatalException</a><br />
-<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#parseFile">parseFile()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.QuotedString-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.QuotedString-class.html">QuotedString</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#postParse">postParse()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#parseFile">parseFile()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.And-class.html#parseImpl">parseImpl()</a><br />
+<span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Regex-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.Regex-class.html">Regex</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Suppress-class.html#postParse">postParse()</a><br />
 <span class="index-where">(in <a href="pyparsing.Suppress-class.html">Suppress</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.And-class.html#parseImpl">parseImpl()</a><br />
-<span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.CaselessKeyword-class.html#parseImpl">parseImpl()</a><br />
+<span class="index-where">(in <a href="pyparsing.CaselessKeyword-class.html">CaselessKeyword</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.SkipTo-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.SkipTo-class.html">SkipTo</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#pprint">pprint()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.CaselessKeyword-class.html#parseImpl">parseImpl()</a><br />
-<span class="index-where">(in <a href="pyparsing.CaselessKeyword-class.html">CaselessKeyword</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.CaselessLiteral-class.html#parseImpl">parseImpl()</a><br />
+<span class="index-where">(in <a href="pyparsing.CaselessLiteral-class.html">CaselessLiteral</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.StringEnd-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.StringEnd-class.html">StringEnd</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.GoToColumn-class.html#preParse">preParse()</a><br />
 <span class="index-where">(in <a href="pyparsing.GoToColumn-class.html">GoToColumn</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.CaselessLiteral-class.html#parseImpl">parseImpl()</a><br />
-<span class="index-where">(in <a href="pyparsing.CaselessLiteral-class.html">CaselessLiteral</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.CharsNotIn-class.html#parseImpl">parseImpl()</a><br />
+<span class="index-where">(in <a href="pyparsing.CharsNotIn-class.html">CharsNotIn</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.StringStart-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.StringStart-class.html">StringStart</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.LineStart-class.html#preParse">preParse()</a><br />
 <span class="index-where">(in <a href="pyparsing.LineStart-class.html">LineStart</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.CharsNotIn-class.html#parseImpl">parseImpl()</a><br />
-<span class="index-where">(in <a href="pyparsing.CharsNotIn-class.html">CharsNotIn</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.CloseMatch-class.html#parseImpl">parseImpl()</a><br />
+<span class="index-where">(in <a href="pyparsing.CloseMatch-class.html">CloseMatch</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.White-class.html#parseImpl">parseImpl()</a><br />
 <span class="index-where">(in <a href="pyparsing.White-class.html">White</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#preParse">preParse()</a><br />
@@ -675,13 +691,6 @@
 <td width="33%" class="link-index"><a href="pyparsing-module.html#pythonStyleComment">pythonStyleComment</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
-<tr>
-<td width="33%" class="link-index"><a href="pyparsing.Literal-class.html#parseImpl">parseImpl()</a><br />
-<span class="index-where">(in <a href="pyparsing.Literal-class.html" onclick="show_private();">Literal</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#parseString">parseString()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
-<td width="33%" class="link-index"> </td>
-</tr>
 </table>
 </td></tr>
 <tr valign="top"><td valign="top" width="1%"><h2 class="epydoc"><a name="Q">Q</a></h2></td>
@@ -752,7 +761,7 @@
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#sciReal">sciReal</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#sci_real">sci_real</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#setResultsName">setResultsName()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
@@ -778,7 +787,7 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#setBreak">setBreak()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#signedInteger">signedInteger</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#signed_integer">signed_integer</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#stringStart">stringStart</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
@@ -868,15 +877,16 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#ungroup">ungroup()</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#upcaseTokens">upcaseTokens()</a><br />
-<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"> </td>
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#upcaseTokens">upcaseTokens()</a><br />
+<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#uuid">uuid</a><br />
+<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#unicodeString">unicodeString</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#uuid">uuid</a><br />
-<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing-module.html#upcaseTokens">upcaseTokens()</a><br />
+<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 <td width="33%" class="link-index"> </td>
 </tr>
 </table>
@@ -949,32 +959,32 @@
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.OneOrMore-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.OneOrMore-class.html">OneOrMore</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Optional-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.Optional-class.html">Optional</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__add__">__add__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Optional-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.Optional-class.html">Optional</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Regex-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.Regex-class.html">Regex</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__and__">__and__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.QuotedString-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.QuotedString-class.html">QuotedString</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Regex-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.Regex-class.html">Regex</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Suppress-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.Suppress-class.html">Suppress</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__bool__">__bool__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.RecursiveGrammarException-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.RecursiveGrammarException-class.html">RecursiveGrammarException</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Suppress-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.Suppress-class.html">Suppress</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.White-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.White-class.html">White</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.OnlyOnce-class.html#__call__">__call__()</a><br />
@@ -1169,33 +1179,41 @@
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Combine-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Combine-class.html">Combine</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.CloseMatch-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.CloseMatch-class.html">CloseMatch</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rand__">__rand__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_charRange">_charRange</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Dict-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Dict-class.html">Dict</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Combine-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Combine-class.html">Combine</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html#__repr__">__repr__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_commasepitem">_commasepitem</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Each-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Each-class.html">Each</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Dict-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Dict-class.html">Dict</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__repr__">__repr__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_commasepitem">_commasepitem</a><br />
+<span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="pyparsing.Each-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Each-class.html">Each</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__repr__">__repr__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_escapedHexChar">_escapedHexChar</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Empty-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Empty-class.html">Empty</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__repr__">__repr__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__req__">__req__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_escapedOctChar">_escapedOctChar</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
@@ -1203,23 +1221,23 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.FollowedBy-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.FollowedBy-class.html">FollowedBy</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__req__">__req__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__reversed__">__reversed__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_escapedPunc">_escapedPunc</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__reversed__">__reversed__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rmul__">__rmul__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_full_ipv6_address">_full_ipv6_address</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.GoToColumn-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.GoToColumn-class.html">GoToColumn</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rmul__">__rmul__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rne__">__rne__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_html_stripper">_html_stripper</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
@@ -1227,7 +1245,7 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Group-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Group-class.html">Group</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rne__">__rne__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__ror__">__ror__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_htmlEntityMap">_htmlEntityMap</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
@@ -1235,7 +1253,7 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Keyword-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Keyword-class.html">Keyword</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__ror__">__ror__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rsub__">__rsub__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_ipv6_part">_ipv6_part</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
@@ -1243,7 +1261,7 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.LineEnd-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.LineEnd-class.html">LineEnd</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rsub__">__rsub__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rxor__">__rxor__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#_iteritems">_iteritems()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
@@ -1251,15 +1269,15 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.LineStart-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.LineStart-class.html">LineStart</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rxor__">__rxor__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__setitem__">__setitem__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#_iterkeys">_iterkeys()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Literal-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Literal-class.html" onclick="show_private();">Literal</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__setitem__">__setitem__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__setstate__">__setstate__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#_itervalues">_itervalues()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
@@ -1267,71 +1285,71 @@
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__setstate__">__setstate__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.And-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_MAX_INT">_MAX_INT</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.NoMatch-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.NoMatch-class.html">NoMatch</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.And-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Combine-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.Combine-class.html">Combine</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_mixed_ipv6_address">_mixed_ipv6_address</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.NotAny-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.NotAny-class.html">NotAny</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Combine-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.Combine-class.html">Combine</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Dict-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.Dict-class.html">Dict</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_optionalNotMatched">_optionalNotMatched</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.OnlyOnce-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.OnlyOnce-class.html">OnlyOnce</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Dict-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.Dict-class.html">Dict</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Group-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.Group-class.html">Group</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#_packratEnabled">_packratEnabled</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Optional-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Optional-class.html">Optional</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Group-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.Group-class.html">Group</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.LineEnd-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.LineEnd-class.html">LineEnd</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_reBracketExpr">_reBracketExpr</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.Or-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Or-class.html">Or</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.LineEnd-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.LineEnd-class.html">LineEnd</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Literal-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.Literal-class.html" onclick="show_private();">Literal</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_short_ipv6_address">_short_ipv6_address</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.Literal-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.Literal-class.html" onclick="show_private();">Literal</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_singleChar">_singleChar</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParseElementEnhance-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseElementEnhance-class.html">ParseElementEnhance</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.NotAny-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.NotAny-class.html">NotAny</a>)</span></td>
 <td width="33%" class="link-index"> </td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParseExpression-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseExpression-class.html">ParseExpression</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.NotAny-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.NotAny-class.html">NotAny</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.OneOrMore-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.OneOrMore-class.html">OneOrMore</a>)</span></td>
 <td width="33%" class="link-index"> </td>
 </tr>
 </table>
@@ -1368,7 +1386,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Sun Aug 14 16:58:53 2016
+    Generated by Epydoc 3.0.1 on Sat Sep 10 10:21:41 2016
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/htmldoc/module-tree.html b/htmldoc/module-tree.html
index 9c19d7d..be42db1 100644
--- a/htmldoc/module-tree.html
... 13992 lines suppressed ...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyparsing.git



More information about the Python-modules-commits mailing list