Merge branch 'nltk:develop' into feature/cnf-mixed-rules

Author: josecols

nltk/__init__.py

@@ -182,7 +182,7 @@ def _fake_Popen(*args, **kwargs):
 # Check if tkinter exists without importing it to avoid crashes after
 # forks on macOS. Only nltk.app, nltk.draw, and demo modules should
 # have top-level tkinter imports. See #2949 for more details.
-if importlib.util.find_spec('tkinter'):
+if importlib.util.find_spec("tkinter"):
     try:
         from nltk.downloader import download_gui
     except RuntimeError as e:

nltk/downloader.py

@@ -170,9 +170,9 @@
 import warnings
 import zipfile
 from hashlib import md5
-from xml.etree import ElementTree
 from urllib.error import HTTPError, URLError
 from urllib.request import urlopen
+from xml.etree import ElementTree
 
 import nltk
 
@@ -1093,7 +1093,10 @@ def _set_download_dir(self, download_dir):
     def _interactive_download(self):
         # Only import tkinter if the user has indicated that they
         # want to draw a UI. See issue #2949 for more info.
-        if os.environ.get('NLTK_DOWNLOADER_FORCE_INTERACTIVE_SHELL', 'false').lower() == 'true':
+        if (
+            os.environ.get("NLTK_DOWNLOADER_FORCE_INTERACTIVE_SHELL", "false").lower()
+            == "true"
+        ):
             DownloaderShell(self).run()
             return
 
@@ -1111,7 +1114,6 @@ def _interactive_download(self):
             DownloaderShell(self).run()
 
 
-
 class DownloaderShell:
     def __init__(self, dataserver):
         self._ds = dataserver
@@ -1372,6 +1374,7 @@ def __init__(self, dataserver, use_threads=True):
         # want to draw a UI. See issue #2949 for more info.
         import tkinter
         from tkinter.messagebox import showerror
+
         self._ds = dataserver
         self._use_threads = use_threads
 
@@ -1433,6 +1436,7 @@ def _init_widgets(self):
         # Only import tkinter if the user has indicated that they
         # want to draw a UI. See issue #2949 for more info.
         import tkinter
+
         from nltk.draw.table import Table
 
         # Create the top-level frame structures
@@ -1625,6 +1629,7 @@ def _select_columns(self):
 
     def _refresh(self):
         from tkinter.messagebox import showerror
+
         self._ds.clear_status_cache()
         try:
             self._fill_table()
@@ -1672,6 +1677,7 @@ def _table_reprfunc(self, row, col, val):
 
     def _set_url(self, url):
         from tkinter.messagebox import showerror
+
         if url == self._ds.url:
             return
         try:
@@ -1683,6 +1689,7 @@ def _set_url(self, url):
 
     def _set_download_dir(self, download_dir):
         from tkinter.messagebox import showerror
+
         if self._ds.download_dir == download_dir:
             return
         # check if the dir exists, and if not, ask if we should create it?
@@ -1709,6 +1716,7 @@ def _show_info(self):
 
     def _prev_tab(self, *e):
         from tkinter.messagebox import showerror
+
         for i, tab in enumerate(self._tab_names):
             if tab.lower() == self._tab and i > 0:
                 self._tab = self._tab_names[i - 1].lower()
@@ -1721,6 +1729,7 @@ def _prev_tab(self, *e):
 
     def _next_tab(self, *e):
         from tkinter.messagebox import showerror
+
         for i, tab in enumerate(self._tab_names):
             if tab.lower() == self._tab and i < (len(self._tabs) - 1):
                 self._tab = self._tab_names[i + 1].lower()
@@ -1733,6 +1742,7 @@ def _next_tab(self, *e):
 
     def _select_tab(self, event):
         from tkinter.messagebox import showerror
+
         self._tab = event.widget["text"].lower()
         try:
             self._fill_table()
@@ -1900,6 +1910,7 @@ def _table_mark(self, *e):
 
     def _show_log(self):
         from nltk.draw.util import ShowText
+
         text = "\n".join(self._log_messages)
         ShowText(self.top, "NLTK Downloader Log", text)
 
@@ -1983,6 +1994,7 @@ def mainloop(self, *args, **kwargs):
 
     def help(self, *e):
         from nltk.draw.util import ShowText
+
         # The default font's not very legible; try using 'fixed' instead.
         try:
             ShowText(
@@ -1997,6 +2009,7 @@ def help(self, *e):
 
     def about(self, *e):
         from nltk.draw.util import ShowText
+
         ABOUT = "NLTK Downloader\n" + "Written by Edward Loper"
         TITLE = "About: NLTK Downloader"
         try:

nltk/text.py

@@ -452,7 +452,7 @@ def collocations(self, num=20, window_size=2):
             >>> from nltk.book import text4
             >>> text4.collocations() # doctest: +NORMALIZE_WHITESPACE
             United States; fellow citizens; years ago; four years; Federal
-            Government; General Government; American people; Vice President; God
+            Government; General Government; Vice President; American people; God
             bless; Chief Justice; one another; fellow Americans; Old World;
             Almighty God; Fellow citizens; Chief Magistrate; every citizen; Indian
             tribes; public debt; foreign nations

nltk/wsd.py

@@ -45,6 +45,8 @@ def lesk(context_sentence, ambiguous_word, pos=None, synsets=None, lang="eng"):
     if not synsets:
         return None
 
-    sense = max(synsets, key=lambda ss: len(context.intersection(ss.definition().split())))
+    sense = max(
+        synsets, key=lambda ss: len(context.intersection(ss.definition().split()))
+    )
 
     return sense