Updated comments in pyparsing_common and CHANGES

git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@357 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b

2 files changed, 6 insertions, 2 deletions

diff --git a/src/CHANGES b/src/CHANGES
index efa9958..aa0dcee 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -6,10 +6,11 @@ Verison 2.1.5 -
 ------------------------------

 - Added more expressions to pyparsing_common:

   . IPv4 and IPv6 addresses (including long, short, and mixed forms

-    of IPv6

+    of IPv6)

   . MAC address

   . ISO8601 date and date time strings

   . UUID (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx)

+  . hex integer (returned as int)

 

 - runTests now returns a two-tuple: success if all tests succeed,

   and an output list of each test and its output lines.

diff --git a/src/pyparsing.py b/src/pyparsing.py
index 2fb471e..c6a0af9 100644
--- a/src/pyparsing.py
+++ b/src/pyparsing.py
@@ -58,7 +58,7 @@ The pyparsing module handles some of the problems that are typically vexing when
 """

 

 __version__ = "2.1.5"

-__versionTime__ = "18 May 2016 13:24 UTC"

+__versionTime__ = "18 May 2016 22:03 UTC"

 __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"

 

 import string

@@ -3900,6 +3900,9 @@ class pyparsing_common:
      - numeric forms (integers, reals, scientific notation)

      - parse actions for converting numeric strings to Python int and/or float types

      - common programming identifiers

+     - network addresses (MAC, IPv4, IPv6)

+     - ISO8601 dates and datetimes

+     - UUID

     """

 

     def convertToInteger(t):