Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't install gettext into builtins #3330

Merged
merged 3 commits into from Feb 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/Makefile
Expand Up @@ -51,7 +51,7 @@ help:

clean:
rm -rf $(BUILDDIR)/*
rm -rf config.rst
rm -rf source/config.rst

html: source/config.rst
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
Expand Down
2 changes: 1 addition & 1 deletion docs/doc-requirements.txt
@@ -1,3 +1,3 @@
sphinx>=1.3.6
sphinx-rtd-theme
nbsphinx==0.2.14
nbsphinx
1 change: 1 addition & 0 deletions docs/source/changelog.rst
Expand Up @@ -13,6 +13,7 @@ For more detailed information, see
upgrade to the latest release.

.. we push for pip 9+ or it will break for Python 2 users when IPython 6 is out.

We strongly recommend that you upgrade to version 9+ of pip before upgrading ``notebook``.

.. tip::
Expand Down
8 changes: 5 additions & 3 deletions notebook/notebookapp.py
Expand Up @@ -832,9 +832,11 @@ def _token_changed(self, change):
`new` argument passed to the standard library method `webbrowser.open`.
The behaviour is not guaranteed, but depends on browser support. Valid
values are:
2 opens a new tab,
1 opens a new window,
0 opens in an existing window.

- 2 opens a new tab,
- 1 opens a new window,
- 0 opens in an existing window.

See the `webbrowser.open` documentation for details.
"""))

Expand Down
1 change: 0 additions & 1 deletion notebook/transutils.py
Expand Up @@ -10,5 +10,4 @@
# Set up message catalog access
base_dir = os.path.realpath(os.path.join(__file__, '..', '..'))
trans = gettext.translation('notebook', localedir=os.path.join(base_dir, 'notebook/i18n'), fallback=True)
trans.install()
_ = trans.gettext