Merge pull request nltk#3219 from purificant/code_linting

Author: stevenbird

.pre-commit-config.yaml

@@ -11,9 +11,9 @@ repos:
     rev: v3.15.0
     hooks:
     - id: pyupgrade
-      args: ["--py37-plus"]
+      args: ["--py38-plus"]
   - repo: https://github.com/ambv/black
-    rev: 22.3.0
+    rev: 23.12.0
     hooks:
     - id: black
   - repo: local

nltk/app/chunkparser_app.py

@@ -713,7 +713,7 @@ def _eval_demon(self):
         if self.normalized_grammar != self._eval_normalized_grammar:
             # Check if we've seen this grammar already.  If so, then
             # just use the old evaluation values.
-            for (g, p, r, f) in self._history:
+            for g, p, r, f in self._history:
                 if self.normalized_grammar == self.normalize_grammar(g):
                     self._history.append((g, p, r, f))
                     self._history_index = len(self._history) - 1
@@ -850,7 +850,7 @@ def _init_widgets(self, top):
             ).grid(column=i * 2 + 1, row=0)
         self.helptabs[self.HELP[0][0]].configure(font=self._font)
         self.helpbox.tag_config("elide", elide=True)
-        for (tag, params) in self.HELP_AUTOTAG:
+        for tag, params in self.HELP_AUTOTAG:
             self.helpbox.tag_config("tag-%s" % tag, **params)
         self.show_help(self.HELP[0][0])
 
@@ -1047,7 +1047,7 @@ def show_trace(self, *e):
     def show_help(self, tab):
         self.helpbox["state"] = "normal"
         self.helpbox.delete("1.0", "end")
-        for (name, tabstops, text) in self.HELP:
+        for name, tabstops, text in self.HELP:
             if name == tab:
                 text = text.replace(
                     "<<TAGSET>>",
@@ -1066,7 +1066,7 @@ def show_help(self, tab):
                 self.helpbox.config(tabs=tabstops)
                 self.helpbox.insert("1.0", text + "\n" * 20)
                 C = "1.0 + %d chars"
-                for (tag, params) in self.HELP_AUTOTAG:
+                for tag, params in self.HELP_AUTOTAG:
                     pattern = f"(?s)(<{tag}>)(.*?)(</{tag}>)"
                     for m in re.finditer(pattern, text):
                         self.helpbox.tag_add("elide", C % m.start(1), C % m.end(1))

nltk/app/wordnet_app.py

@@ -281,6 +281,7 @@ def run():
 # Main logic for wordnet browser.
 #
 
+
 # This is wrapped inside a function since wn is only available if the
 # WordNet corpus is installed.
 def _pos_tuples():
@@ -983,7 +984,7 @@ def app():
     server_mode = False
     help_mode = False
     logfilename = None
-    for (opt, value) in opts:
+    for opt, value in opts:
         if (opt == "-l") or (opt == "--logfile"):
             logfilename = str(value)
         elif (opt == "-p") or (opt == "--port"):

nltk/ccg/api.py

@@ -125,7 +125,7 @@ def substitute(self, substitutions):
         """If there is a substitution corresponding to this variable,
         return the substituted category.
         """
-        for (var, cat) in substitutions:
+        for var, cat in substitutions:
             if var == self:
                 return cat
         return self
@@ -197,7 +197,7 @@ def substitute(self, subs):
         if not self.is_variable():
             return self
 
-        for (var, restrs) in subs:
+        for var, restrs in subs:
             if var == "_":
                 return Direction(self._dir, restrs)
         return self

nltk/ccg/chart.py

@@ -380,7 +380,7 @@ def printCCGDerivation(tree):
 
     # Construct a string with both the leaf word and corresponding
     # category aligned.
-    for (leaf, cat) in leafcats:
+    for leaf, cat in leafcats:
         str_cat = "%s" % cat
         nextlen = 2 + max(len(leaf), len(str_cat))
         lcatlen = (nextlen - len(str_cat)) // 2

nltk/ccg/combinator.py

@@ -128,6 +128,7 @@ def __str__(self):
 
 # Predicates for function application.
 
+
 # Ensures the left functor takes an argument on the right
 def forwardOnly(left, right):
     return left.dir().is_forward()

nltk/chat/util.py

@@ -94,7 +94,7 @@ def respond(self, str):
         """
 
         # check each pattern
-        for (pattern, response) in self._pairs:
+        for pattern, response in self._pairs:
             match = pattern.match(str)
 
             # did the pattern match?

nltk/chunk/named_entity.py

@@ -140,7 +140,7 @@ def _tagged_to_parse(self, tagged_tokens):
         """
         sent = Tree("S", [])
 
-        for (tok, tag) in tagged_tokens:
+        for tok, tag in tagged_tokens:
             if tag == "O":
                 sent.append(tok)
             elif tag.startswith("B-"):
@@ -260,7 +260,7 @@ def subfunc(m):
     if fmt == "binary":
         i = 0
         toks = Tree("S", [])
-        for (s, e, typ) in sorted(entities):
+        for s, e, typ in sorted(entities):
             if s < i:
                 s = i  # Overlapping!  Deal with this better?
             if e <= s:
@@ -275,7 +275,7 @@ def subfunc(m):
     elif fmt == "multiclass":
         i = 0
         toks = Tree("S", [])
-        for (s, e, typ) in sorted(entities):
+        for s, e, typ in sorted(entities):
             if s < i:
                 s = i  # Overlapping!  Deal with this better?
             if e <= s:

nltk/chunk/regexp.py

@@ -165,7 +165,6 @@ def to_chunkstruct(self, chunk_label="CHUNK"):
         index = 0
         piece_in_chunk = 0
         for piece in re.split("[{}]", self._str):
-
             # Find the list of tokens contained in this piece.
             length = piece.count("<")
             subsequence = self._pieces[index : index + length]

nltk/chunk/util.py

@@ -457,7 +457,7 @@ def conlltags2tree(
     Convert the CoNLL IOB format to a tree.
     """
     tree = Tree(root_label, [])
-    for (word, postag, chunktag) in sentence:
+    for word, postag, chunktag in sentence:
         if chunktag is None:
             if strict:
                 raise ValueError("Bad conll tag sequence")
@@ -592,7 +592,6 @@ def ieerstr2tree(
 
 
 def demo():
-
     s = "[ Pierre/NNP Vinken/NNP ] ,/, [ 61/CD years/NNS ] old/JJ ,/, will/MD join/VB [ the/DT board/NN ] ./."
     import nltk