Fixed dict structure in makeHTMLTags expressions, and added tag_body attribute to the generated start expression giving easy access to a SkipTo(closeTag) that will parse the tag's body text; some code cleanup and removed duplication among examples

1 files changed, 30 insertions, 30 deletions

diff --git a/examples/urlExtractor.py b/examples/urlExtractor.py
index e4299b9..fbc2fa6 100644
--- a/examples/urlExtractor.py
+++ b/examples/urlExtractor.py
@@ -1,30 +1,30 @@
-# URL extractor

-# Copyright 2004, Paul McGuire

-from pyparsing import makeHTMLTags, SkipTo, pyparsing_common as ppc

-import urllib.request

-from contextlib import closing

-import pprint

-

-linkOpenTag, linkCloseTag = makeHTMLTags('a')

-

-linkBody = SkipTo(linkCloseTag)

-linkBody.setParseAction(ppc.stripHTMLTags)

-linkBody.addParseAction(lambda toks: ' '.join(toks[0].strip().split()))

-

-link = linkOpenTag + linkBody("body") + linkCloseTag.suppress()

-

-# Go get some HTML with some links in it.

-with closing(urllib.request.urlopen("https://www.yahoo.com/")) as serverListPage:

-    htmlText = serverListPage.read().decode("UTF-8")

-

-# scanString is a generator that loops through the input htmlText, and for each

-# match yields the tokens and start and end locations (for this application, we are

-# not interested in the start and end values).

-for toks,strt,end in link.scanString(htmlText):

-    print(toks.asList())

-

-# Create dictionary from list comprehension, assembled from each pair of tokens returned

-# from a matched URL.

-pprint.pprint(

-    {toks.body: toks.href for toks,strt,end in link.scanString(htmlText)}

-    )

+# URL extractor
+# Copyright 2004, Paul McGuire
+from pyparsing import makeHTMLTags, pyparsing_common as ppc
+import urllib.request
+from contextlib import closing
+import pprint
+
+linkOpenTag, linkCloseTag = makeHTMLTags('a')
+
+linkBody = linkOpenTag.tag_body
+linkBody.setParseAction(ppc.stripHTMLTags)
+linkBody.addParseAction(lambda toks: ' '.join(toks[0].strip().split()))
+
+link = linkOpenTag + linkBody("body") + linkCloseTag.suppress()
+
+# Go get some HTML with some links in it.
+with closing(urllib.request.urlopen("https://www.cnn.com/")) as serverListPage:
+    htmlText = serverListPage.read().decode("UTF-8")
+
+# scanString is a generator that loops through the input htmlText, and for each
+# match yields the tokens and start and end locations (for this application, we are
+# not interested in the start and end values).
+for toks, strt, end in link.scanString(htmlText):
+    print(toks.asList())
+
+# Create dictionary from list comprehension, assembled from each pair of tokens returned
+# from a matched URL.
+pprint.pprint(
+    {toks.body: toks.href for toks, strt, end in link.scanString(htmlText)}
+    )