FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.7] bpo-33185: Improve wording and markup (GH-6477) by miss-islington · Pull Request #6478 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

[3.7] bpo-33185: Improve wording and markup (GH-6477) #6478

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.

Sign up for GitHub

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

Merged
miss-islington merged 1 commit into from
Apr 15, 2018
Conversation 2 Commits 1 Checks 0 Files changed
Merged

[3.7] bpo-33185: Improve wording and markup (GH-6477) #6478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) .rst  (2) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
12 changes: 7 additions & 5 deletions Doc/whatsnew/3.7.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1150,11 +1150,13 @@ Changes in Python behavior
parentheses can be omitted only on calls.
(Contributed by Serhiy Storchaka in :issue:`32012` and :issue:`32023`.)

* When using the ``-m`` switch, the starting directory is now added to sys.path,
rather than the current working directory. Any programs that are checking for
the empty string in :data:`sys.path`, or otherwise relying on the previous
behaviour, will need to be updated accordingly (e.g. by checking for
``os.getcwd()`` in addition to checking for the empty string).
* When using the :option:`-m` switch, the initial working directory is now added
to :data:`sys.path`, rather than an empty string (which dynamically denoted
the current working directory at the time of each import). Any programs that
are checking for the empty string, or otherwise relying on the previous
behaviour, will need to be updated accordingly (e.g. by also checking for
``os.getcwd()`` or ``os.path.dirname(__main__.__file__)``, depending on why
the code was checking for the empty string in the first place).


Changes in the Python API
Expand Down
2 changes: 1 addition & 1 deletion Lib/pydoc.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2643,7 +2643,7 @@ def _get_revised_path(given_path, argv0):

# Note: the tests only cover _get_revised_path, not _adjust_cli_path itself
def _adjust_cli_sys_path():
"""Ensures current directory is on sys.path, and __main__ directory is not
"""Ensures current directory is on sys.path, and __main__ directory is not.

Exception: __main__ dir is left alone if it's also pydoc's directory.
"""
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_pydoc.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ def _get_revised_path(self, given_path, argv0=None):
return pydoc._get_revised_path(given_path, argv0)

def _get_starting_path(self):
# Get a copy of sys.path without the current directory
# Get a copy of sys.path without the current directory.
clean_path = sys.path.copy()
for spelling in self.curdir_spellings:
for __ in range(clean_path.count(spelling)):
Expand Down
6 changes: 3 additions & 3 deletions Misc/NEWS.d/next/Library/2018-04-08-22-54-07.bpo-33185.Id-Ba9.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Fixed regression when running pydoc with the ``-m`` switch. (The regression
was introduced in 3.7.0b3 by the resolution of bpo-33053)
Fixed regression when running pydoc with the :option:`-m` switch. (The regression
was introduced in 3.7.0b3 by the resolution of :issue:`33053`)

This fix also changed pydoc to add ``os.getcwd()`` to ``sys.path`` when
This fix also changed pydoc to add ``os.getcwd()`` to :data:`sys.path` when
necessary, rather than adding ``"."``.
Back | FazBrowse Home | New Git URL