From d55aad0afb292030724e6849830060b740f93d53 Mon Sep 17 00:00:00 2001 From: ptmcg Date: Sun, 8 Aug 2021 07:45:27 -0500 Subject: Sweep code for calls using legacy names --- pyparsing/testing.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pyparsing/testing.py') diff --git a/pyparsing/testing.py b/pyparsing/testing.py index f06dffc..45c84c2 100644 --- a/pyparsing/testing.py +++ b/pyparsing/testing.py @@ -82,7 +82,7 @@ class pyparsing_test: ParserElement.DEFAULT_WHITE_CHARS != self._save_context["default_whitespace"] ): - ParserElement.setDefaultWhitespaceChars( + ParserElement.set_default_whitespace_chars( self._save_context["default_whitespace"] ) @@ -98,7 +98,7 @@ class pyparsing_test: ParserElement._packratEnabled = False if self._save_context["packrat_enabled"]: - ParserElement.enablePackrat(self._save_context["packrat_cache_size"]) + ParserElement.enable_packrat(self._save_context["packrat_cache_size"]) else: ParserElement._parse = self._save_context["packrat_parse"] ParserElement._left_recursion_enabled = self._save_context[ @@ -133,9 +133,9 @@ class pyparsing_test: and compare any defined results names with an optional ``expected_dict``. """ if expected_list is not None: - self.assertEqual(expected_list, result.asList(), msg=msg) + self.assertEqual(expected_list, result.as_list(), msg=msg) if expected_dict is not None: - self.assertEqual(expected_dict, result.asDict(), msg=msg) + self.assertEqual(expected_dict, result.as_dict(), msg=msg) def assertParseAndCheckList( self, expr, test_string, expected_list, msg=None, verbose=True @@ -144,7 +144,7 @@ class pyparsing_test: Convenience wrapper assert to test a parser element and input string, and assert that the resulting ``ParseResults.asList()`` is equal to the ``expected_list``. """ - result = expr.parseString(test_string, parseAll=True) + result = expr.parse_string(test_string, parse_all=True) if verbose: print(result.dump()) self.assertParseResultsEquals(result, expected_list=expected_list, msg=msg) @@ -156,7 +156,7 @@ class pyparsing_test: Convenience wrapper assert to test a parser element and input string, and assert that the resulting ``ParseResults.asDict()`` is equal to the ``expected_dict``. """ - result = expr.parseString(test_string, parseAll=True) + result = expr.parse_string(test_string, parseAll=True) if verbose: print(result.dump()) self.assertParseResultsEquals(result, expected_dict=expected_dict, msg=msg) -- cgit v1.2.1