summaryrefslogtreecommitdiff
path: root/examples/rangeCheck.py
diff options
context:
space:
mode:
Diffstat (limited to 'examples/rangeCheck.py')
-rw-r--r--examples/rangeCheck.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/rangeCheck.py b/examples/rangeCheck.py
index 2d1d2c8..be54833 100644
--- a/examples/rangeCheck.py
+++ b/examples/rangeCheck.py
@@ -8,7 +8,7 @@
# Copyright 2011,2015 Paul T. McGuire
#
-from pyparsing import Word, nums, Suppress, Optional
+from pyparsing import Word, nums, Suppress, Opt
from datetime import datetime
@@ -30,11 +30,11 @@ def ranged_value(expr, minval=None, maxval=None):
(False, False): "value is not in the range ({} to {})".format(minval, maxval),
}[minval is None, maxval is None]
- return expr().addCondition(inRangeCondition, message=outOfRangeMessage)
+ return expr().add_condition(inRangeCondition, message=outOfRangeMessage)
# define the expressions for a date of the form YYYY/MM/DD or YYYY/MM (assumes YYYY/MM/01)
-integer = Word(nums).setName("integer")
+integer = Word(nums).set_name("integer")
integer.setParseAction(lambda t: int(t[0]))
month = ranged_value(integer, 1, 12)
@@ -42,11 +42,11 @@ day = ranged_value(integer, 1, 31)
year = ranged_value(integer, 2000, None)
SLASH = Suppress("/")
-dateExpr = year("year") + SLASH + month("month") + Optional(SLASH + day("day"))
-dateExpr.setName("date")
+dateExpr = year("year") + SLASH + month("month") + Opt(SLASH + day("day"))
+dateExpr.set_name("date")
# convert date fields to datetime (also validates dates as truly valid dates)
-dateExpr.setParseAction(lambda t: datetime(t.year, t.month, t.day or 1).date())
+dateExpr.set_parse_action(lambda t: datetime(t.year, t.month, t.day or 1).date())
# add range checking on dates
mindate = datetime(2002, 1, 1).date()
@@ -54,7 +54,7 @@ maxdate = datetime.now().date()
dateExpr = ranged_value(dateExpr, mindate, maxdate)
-dateExpr.runTests(
+dateExpr.run_tests(
"""
2011/5/8
2001/1/1