typos & small bug fixes

Author: Tom De Smedt

examples/08-server/02-api/api.py

@@ -29,7 +29,7 @@
 # You should see some JSON-output:
 # {"language": "en", "confidence": 0.83}
 
-@app.route("/language", limit=100, time=HOUR, key=lambda data: app.request.ip)
+@app.route("/language", limit=100, time=HOUR)
 def predict_language(q=""):
     #print q
     iso, confidence = language(q) # (takes some time to load the first time)
@@ -53,10 +53,6 @@ def predict_language(q=""):
 # In this example, limit=100 and time=HOUR means up to a 100 requests/hour.
 # After that, the user will get a HTTP 429 Too Many Requests error.
 
-# The "key" function takes a dictionary of all query parameters
-# and returns a unique ID for each user.
-# In this example we simply used the user's IP-address.
-
 # The example below demonstrates how rates can be set up per user.
 # In this case, only the user with key=1234 is allowed access.
 # All other requests will generate a HTTP 403 Forbidden error.

pattern/db/__init__.py

@@ -96,6 +96,7 @@ def pd(*args):
     "%Y-%m-%d",                    # 2010-09-21
     "%d/%m/%Y",                    # 21/09/2010
     "%d %B %Y",                    # 21 September 2010
+    "%d %b %Y",                    # 21 Sep 2010
     "%B %d %Y",                    # September 21 2010
     "%B %d, %Y",                   # September 21, 2010
 ]

pattern/server/__init__.py

@@ -1243,15 +1243,16 @@ def run(self, host=LOCALHOST, port=8080, threads=30, queue=20, timeout=10, sessi
             config={"/": {
                 "tools.staticdir.on"       : self.static is not None,
                 "tools.staticdir.dir"      : self.static,
-                "tools.sessions.on"        : sessions
+                "tools.sessions.on"        : bool(sessions),
+                "tools.sessions.timeout"   : 60 if sessions is True else int(sessions)
         }})
         # Static content can include favicon.ico
         self.favicon_ico = cp.tools.staticfile.handler(
             os.path.join(self.static, "favicon.ico")
         )
         # Relative root = project path.
         os.chdir(self._path)
-        # With mod_wsgi, stdout is restriced.
+        # With mod_wsgi, stdout is restricted.
         if embedded:
             sys.stdout = sys.stderr
         else:

pattern/text/en/en-entities.txt

@@ -11,7 +11,10 @@ Afghanistan LOC
 Africa LOC
 Al Capone PERS
 Al Pacino PERS
+Al-Raqqah LOC
+Al-Sham LOC
 Alaska LOC
+Aleppo LOC
 Albert Einstein PERS
 Albert Hofmann PERS
 Albert Schweitzer PERS
@@ -54,12 +57,14 @@ BMW ORG
 Babe Ruth PERS
 Bacardi ORG
 Backstreet Boys
+Baghdad LOC
 Bangladesh LOC
 Barack Obama PERS
 Barbra Streisand PERS
 Barcelona LOC
 Batman PERS
 Beethoven PERS
+Beijing LOC
 Belarus LOC
 Belgium LOC
 Ben Affleck PERS
@@ -89,12 +94,14 @@ Britney Spears PERS
 Bruce Lee PERS
 Bruce Willis PERS
 Bruno Mars PERS
+Brussels LOC 
 Buddhism
 Bulgaria LOC
 Burger King
 Burma LOC
 C.S. Lewis PERS
 Cadillac ORG
+Calais LOC
 California LOC
 Cameron Diaz PERS
 Cameron Newton PERS
@@ -131,13 +138,16 @@ Cuba LOC
 DNA
 Daft Punk
 Dalai Lama PERS
+Damascus LOC
 Daniel Radcliffe PERS
+Daraa LOC
 Darren Aronofsky PERS
 Darren Criss PERS
 Darth Vader PERS
 David Beckham PERS
 David Bowie PERS
 David Cook PERS
+Deir ez-Zor LOC
 Demi Lovato PERS
 Demi Moore PERS
 Denmark LOC
@@ -240,6 +250,7 @@ Henry V PERS
 Henry VIII PERS
 Hilary Duff PERS
 Hillary Clinton PERS
+Homs LOC
 Honda ORG
 Hong Kong LOC
 Hotmail
@@ -255,6 +266,7 @@ Indira Gandhi PERS
 Indonesia LOC
 Internet Explorer
 Iran LOC
+Iraq LOC
 Ireland LOC
 Iron Man PERS
 Isaac Newton PERS
@@ -413,6 +425,8 @@ Mohammed Ali PERS
 Mona Lisa PERS
 Montreal LOC
 Morocco LOC
+Moscow LOC
+Mosul LOC
 Mother Teresa PERS
 Mother's Day
 Mozart PERS
@@ -438,6 +452,7 @@ Nicole Scherzinger PERS
 Nigeria LOC
 Nike ORG
 Nivea ORG
+Nineveh LOC
 North America LOC
 North Korea LOC
 Norway LOC
@@ -449,6 +464,7 @@ Owen Wilson PERS
 Ozzfest
 Pablo Picasso PERS
 Pakistan LOC
+Palmyra LOC
 Panasonic ORG
 Paris LOC
 Paul McCartney PERS
@@ -476,6 +492,7 @@ Queen Victoria PERS
 Rachmaninoff PERS
 Raiders of the Lost Ark
 Raisa Gorbachev PERS
+Raqqa LOC
 Real Madrid ORG
 Red Hot Chili Peppers PERS
 Reese Witherspoon PERS
@@ -559,6 +576,7 @@ Superman PERS
 Sweden LOC
 Switzerland LOC
 Sylvester Stallone PERS
+Syria LOC
 Taiwan LOC
 Taj Mahal LOC
 Take That
@@ -581,6 +599,7 @@ Theodore Roosevelt PERS
 Thomas Jefferson PERS
 Thor PERS
 Tiger Woods PERS
+Tigris LOC
 Titanic
 Tom Brady PERS
 Tom Cruise PERS

pattern/text/en/inflect.py

@@ -516,7 +516,7 @@ def pluralize(word, pos=NOUN, custom={}, classical=True):
     "bison"      , "debris"   , "headquarters", "pincers"    , "trout"     ,
     "bream"      , "diabetes" , "herpes"      , "pliers"     , "tuna"      ,
     "breeches"   , "djinn"    , "high-jinks"  , "proceedings", "whiting"   ,
-    "britches"   , "eland"    , "homework"    , "rabies"     , "wildebeest"
+    "britches"   , "eland"    , "homework"    , "rabies"     , "wildebeest",
     "carp"       , "elk"      , "innings"     , "salmon"     , 
     "chassis"    , "flounder" , "jackanapes"  , "scissors"   , 
     "christmas"  , "gallows"  , "mackerel"    , "series"     , 
@@ -528,15 +528,15 @@ def pluralize(word, pos=NOUN, custom={}, classical=True):
 singular_uncountable = set((
     "advice"     , "equipment", "happiness"   , "luggage"    , "news"      , "software"     ,
     "bread"      , "fruit"    , "information" , "mathematics", "progress"  , "understanding",
-    "butter"     , "furniture", "ketchup"     , "mayonnaise" , "research"  , "water"
+    "butter"     , "furniture", "ketchup"     , "mayonnaise" , "research"  , "water"        ,
     "cheese"     , "garbage"  , "knowledge"   , "meat"       , "rice"      , 
     "electricity", "gravel"   , "love"        , "mustard"    , "sand"      , 
 ))
 singular_ie = set((
     "alergie"    , "cutie"    , "hoagie"      , "newbie"     , "softie"    , "veggie"       , 
     "auntie"     , "doggie"   , "hottie"      , "nightie"    , "sortie"    , "weenie"       , 
     "beanie"     , "eyrie"    , "indie"       , "oldie"      , "stoolie"   , "yuppie"       , 
-    "birdie"     , "freebie"  , "junkie"      , "^pie"       , "sweetie"   , "zombie"
+    "birdie"     , "freebie"  , "junkie"      , "^pie"       , "sweetie"   , "zombie"       ,
     "bogie"      , "goonie"   , "laddie"      , "pixie"      , "techie"    , 
     "bombie"     , "groupie"  , "laramie"     , "quickie"    , "^tie"      , 
     "collie"     , "hankie"   , "lingerie"    , "reverie"    , "toughie"   , 
@@ -549,7 +549,6 @@ def pluralize(word, pos=NOUN, custom={}, classical=True):
          "beeves": "beef", 
        "brethren": "brother", 
        "children": "child",
-       "children": "child", 
         "corpora": "corpus", 
        "corpuses": "corpus", 
     "ephemerides": "ephemeris", 

pattern/text/search.py

@@ -445,7 +445,7 @@ def _parents(self, word, pos="NN"):
 CHUNKS = dict.fromkeys(["NP", "PP", "VP", "ADVP", "ADJP", "SBAR", "PRT", "INTJ"], True)
 ROLES  = dict.fromkeys(["SBJ", "OBJ", "PRD", "TMP", "CLR", "LOC", "DIR", "EXT", "PRP"], True)
 TAGS   = dict.fromkeys(["CC", "CD", "CJ", "DT", "EX", "FW", "IN", "JJ", "JJR", "JJS", "JJ*", 
-                        "LS", "MD", "NN", "NNS", "NNP", "NNPS", "NN*", "NO", "PDT", "PR", 
+                        "LS", "MD", "NN", "NNS", "NNP", "NNP*", "NNPS", "NN*", "NO", "PDT", "PR", 
                         "PRP", "PRP$", "PR*", "PRP*", "PT", "RB", "RBR", "RBS", "RB*", "RP", 
                         "SYM", "TO", "UH", "VB", "VBZ", "VBP", "VBD", "VBN", "VBG", "VB*", 
                         "WDT", "WP*", "WRB", "X", ".", ",", ":", "(", ")"], True)

pattern/web/__init__.py

@@ -1370,10 +1370,10 @@ def search(self, query, type=SEARCH, start=1, count=10, sort=RELEVANCY, size=Non
         # 3) Restrict language.
         if type in (SEARCH, IMAGE) and self.language is not None:
             url.query["Query"] = url.query["Query"][:-1] + " language: %s'" % self.language
-        #if self.language is not None:
-        #    market = locale.market(self.language)
-        #    if market:
-        #        url.query["market"] = market
+        if type in (NEWS,) and self.language is not None:
+            market = locale.market(self.language)
+            if market:
+                url.query["Market"] = "'" + market + "'"
         # 4) Parse JSON response.
         kwargs["authentication"] = ("", self.license)
         kwargs.setdefault("unicode", True)