Skip to content

Commit ce145a6

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into ewn
2 parents b3c7873 + 007cf75 commit ce145a6

File tree

337 files changed

+867
-440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

337 files changed

+867
-440
lines changed

AUTHORS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,15 @@
299299
- Steven Thomas Smith <https://github.com/essandess>
300300
- Jan Lennartz <https://github.com/Madnex>
301301
- Tim Sockel <https://github.com/TiMauzi>
302+
- Ikram Ul Haq <https://github.com/ulhaqi12>
302303
- Akihiro Yamazaki <https://github.com/zakkie>
303304
- Ron Urbach <https://github.com/sharpblade4>
304305
- Vivek Kalyan <https://github.com/vivekkalyan>
305306
- Tom Strange https://github.com/strangetom
307+
- Samer Masterson <https://github.com/samertm>
308+
- William LaCroix <https://github.com/WilliamPLaCroix>
309+
- Peter de Blanc <https://github.com/pdeblanc>
310+
- Jose Cols <https://github.com/josecols>
306311

307312
## Others whose work we've taken and included in NLTK, but who didn't directly contribute it:
308313

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Natural Language Toolkit: source Makefile
22
#
3-
# Copyright (C) 2001-2024 NLTK Project
3+
# Copyright (C) 2001-2025 NLTK Project
44
# Author: Steven Bird <[email protected]>
55
# Edward Loper <[email protected]>
66
# URL: <https://www.nltk.org/>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ If you publish work that uses NLTK, please cite the NLTK book, as follows:
3333

3434
## Copyright
3535

36-
Copyright (C) 2001-2024 NLTK Project
36+
Copyright (C) 2001-2025 NLTK Project
3737

3838
For license information, see [LICENSE.txt](LICENSE.txt).
3939

RELEASE-HOWTO.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Building an NLTK distribution
2929

3030
3. Build Documentation
3131
- Check the copyright year is correct and update if necessary
32-
e.g. ./tools/global_replace.py 2001-2022 2001-2024
32+
e.g. ./tools/global_replace.py 2001-2022 2001-2025
3333
check web/conf.py copyright line
3434
- Check that installation instructions are up-to-date
3535
(including the range of Python versions that are supported)

nltk/__init__.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Natural Language Toolkit (NLTK)
22
#
3-
# Copyright (C) 2001-2024 NLTK Project
3+
# Copyright (C) 2001-2025 NLTK Project
44
# Authors: Steven Bird <[email protected]>
55
# Edward Loper <[email protected]>
66
# URL: <https://www.nltk.org/>
@@ -19,6 +19,7 @@
1919
"""
2020

2121
import os
22+
import importlib
2223

2324
# //////////////////////////////////////////////////////
2425
# Metadata
@@ -42,7 +43,7 @@
4243

4344
# Copyright notice
4445
__copyright__ = """\
45-
Copyright (C) 2001-2024 NLTK Project.
46+
Copyright (C) 2001-2025 NLTK Project.
4647
4748
Distributed and Licensed under the Apache License, Version 2.0,
4849
which is included by reference.
@@ -169,7 +170,6 @@ def _fake_Popen(*args, **kwargs):
169170
toolbox = lazyimport.LazyModule("toolbox", locals(), globals())
170171

171172
# Optional loading
172-
173173
try:
174174
import numpy
175175
except ImportError:
@@ -179,11 +179,10 @@ def _fake_Popen(*args, **kwargs):
179179

180180
from nltk.downloader import download, download_shell
181181

182-
try:
183-
import tkinter
184-
except ImportError:
185-
pass
186-
else:
182+
# Check if tkinter exists without importing it to avoid crashes after
183+
# forks on macOS. Only nltk.app, nltk.draw, and demo modules should
184+
# have top-level tkinter imports. See #2949 for more details.
185+
if importlib.util.find_spec("tkinter"):
187186
try:
188187
from nltk.downloader import download_gui
189188
except RuntimeError as e:

nltk/app/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Natural Language Toolkit: Applications package
22
#
3-
# Copyright (C) 2001-2024 NLTK Project
3+
# Copyright (C) 2001-2025 NLTK Project
44
# Author: Edward Loper <[email protected]>
55
# Steven Bird <[email protected]>
66
# URL: <https://www.nltk.org/>

nltk/app/chartparser_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Natural Language Toolkit: Chart Parser Application
22
#
3-
# Copyright (C) 2001-2024 NLTK Project
3+
# Copyright (C) 2001-2025 NLTK Project
44
# Author: Edward Loper <[email protected]>
55
# Jean Mark Gawron <[email protected]>
66
# Steven Bird <[email protected]>

nltk/app/chunkparser_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Natural Language Toolkit: Regexp Chunk Parser Application
22
#
3-
# Copyright (C) 2001-2024 NLTK Project
3+
# Copyright (C) 2001-2025 NLTK Project
44
# Author: Edward Loper <[email protected]>
55
# URL: <https://www.nltk.org/>
66
# For license information, see LICENSE.TXT

nltk/app/collocations_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Natural Language Toolkit: Collocations Application
22
# Much of the GUI code is imported from concordance.py; We intend to merge these tools together
3-
# Copyright (C) 2001-2024 NLTK Project
3+
# Copyright (C) 2001-2025 NLTK Project
44
# Author: Sumukh Ghodke <[email protected]>
55
# URL: <https://www.nltk.org/>
66
# For license information, see LICENSE.TXT

nltk/app/concordance_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Natural Language Toolkit: Concordance Application
22
#
3-
# Copyright (C) 2001-2024 NLTK Project
3+
# Copyright (C) 2001-2025 NLTK Project
44
# Author: Sumukh Ghodke <[email protected]>
55
# URL: <https://www.nltk.org/>
66
# For license information, see LICENSE.TXT

0 commit comments

Comments
 (0)