Use the presence of `builtins` rather than `configparser` to indicate… · HeshDeng/python-future@d25f4f8 · GitHub

HeshDeng / python-future Public

forked from PythonCharmers/python-future

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit d25f4f8

Browse filesBrowse the repository at this point in the historyBrowse files

edschofield

committed

Use the presence of builtins rather than configparser to indicate the future/src folder

1 parent 5cbeb4b commit d25f4f8
Copy full SHA for d25f4f8

2 files changed

+6-2Lines changed: 6 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• setup.py
• src/future/standard_library
  • __init__.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎setup.py‎

Copy file name to clipboardExpand all lines: setup.py

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -135,7 +135,9 @@
135	135	'_markupbase',
136	136	'_thread',
137	137	'builtins',
138		- # 'configparser',
	138	+ # Catch the case that configparser is in the build folder
	139	+ # from a previous version of `future`:
	140	+ 'configparser',
139	141	'copyreg',
140	142	'html',
141	143	'http',

Collapse file

‎src/future/standard_library/__init__.py‎

Copy file name to clipboardExpand all lines: src/future/standard_library/__init__.py

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -755,7 +755,9 @@ def __enter__(self):
755	755	self.old_sys_modules = copy.copy(sys.modules)
756	756	if sys.version_info[0] < 3:
757	757	return
758		- FUTURE_SOURCE_SUBFOLDERS = ['future', 'past', 'libfuturize', 'configparser']
	758	+ # The presence of all these indicates we've found our source folder,
	759	+ # because `builtins` won't have been installed in site-packages by setup.py:
	760	+ FUTURE_SOURCE_SUBFOLDERS = ['future', 'past', 'libfuturize', 'libpasteurize', 'builtins']
759	761
760	762	# Look for the future source folder:
761	763	for folder in self.old_sys_path:

0 commit comments

Comments

0 (0)