Skip to content

bpo-36778: fix test_startup_imports if default codepage is cp65001 #13072

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

Closed
wants to merge 4 commits into from
Closed

bpo-36778: fix test_startup_imports if default codepage is cp65001 #13072

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a9eac7
bpo-36778: fix test_startup_imports if default codepage is UTF-8
May 3, 2019
0015e15
edit comments
May 6, 2019
a30a74f
merge master
May 6, 2019
43d879b
fix merge
May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions Lib/test/test_site.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
from unittest import mock
from copy import copy

if sys.platform == 'win32':
import locale

# These tests are not particularly useful if Python was invoked with -S.
# If you add tests that are useful under -S, this skip should be moved
# to the class level.
Expand Down Expand Up @@ -530,15 +533,24 @@ def test_startup_imports(self):

# http://bugs.python.org/issue9548
self.assertNotIn('locale', modules, stderr)

# http://bugs.python.org/issue19209
self.assertNotIn('copyreg', modules, stderr)

# http://bugs.python.org/issue19218
collection_mods = {'_collections', 'collections', 'functools',
'heapq', 'itertools', 'keyword', 'operator',
'reprlib', 'types', 'weakref'
}.difference(sys.builtin_module_names)
if sys.platform != 'darwin':
# http://bugs.python.org/issue19209
self.assertNotIn('copyreg', modules, stderr)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't revert my change!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry. That wasn't intentional.

if sys.platform == 'win32' and locale.getpreferredencoding() == 'cp65001':
# https://bugs.python.org/issue36778
# If the default ansi codepage on Windows is 65001 (CP_UTF8)
# then cp65001.py is loaded. When cp65001.py loads it loads
# additional modules that result in a less optimized startup.
# Ignore the unoptimized module loads for now.
collection_mods = {'_collections', 'itertools', 'types',
'weakref'
}.difference(sys.builtin_module_names)
else:
# http://bugs.python.org/issue19218>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is typo at the end of the URL

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Victor fixed this in #13230
The test change is not needed

collection_mods = {'_collections', 'collections', 'functools',
'heapq', 'itertools', 'keyword', 'operator',
'reprlib', 'types', 'weakref'
}.difference(sys.builtin_module_names)
self.assertFalse(modules.intersection(collection_mods), stderr)

def test_startup_interactivehook(self):
Expand Down