-
Notifications
You must be signed in to change notification settings - Fork 140
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
python3: Fix pyc-only related runtime exceptions
Python3 changes the pyc lookup strategy, ignoring the __pycache__ directory if the .py file is missing. Change install location to enable use of .pyc without their parent .py See http://www.python.org/dev/peps/pep-3147 [Peter: add patch header] Signed-off-by: Daniel Nelson <daniel@sigpwr.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be> (untested) Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
- Loading branch information
Showing
2 changed files
with
67 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
python3: Fix pyc-only related runtime exceptions | ||
|
||
Python3 changes the pyc lookup strategy, ignoring the | ||
__pycache__ directory if the .py file is missing. Change | ||
install location to enable use of .pyc without their parent .py | ||
|
||
See http://www.python.org/dev/peps/pep-3147 | ||
|
||
Signed-off-by: Daniel Nelson <daniel@sigpwr.com> | ||
|
||
--- python3-3.3.0/configure.ac 2013-01-27 16:35:52.429067797 -0800 | ||
+++ python3-3.3.0/configure.ac 2013-01-27 16:43:43.528601443 -0800 | ||
@@ -1827,6 +1827,23 @@ | ||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; | ||
esac | ||
|
||
+STDLIB_CACHE_FLAGS= | ||
+AC_MSG_CHECKING(for --enable-old-stdlib-cache) | ||
+AC_ARG_ENABLE(old-stdlib-cache, | ||
+ AS_HELP_STRING([--enable-old-stdlib-cache], [enable pre-pep3147 stdlib cache]), | ||
+[ | ||
+ if test "$enableval" = "yes" | ||
+ then | ||
+ STDLIB_CACHE_FLAGS="-b" | ||
+ else | ||
+ STDLIB_CACHE_FLAGS="" | ||
+ fi | ||
+], | ||
+[ | ||
+ STDLIB_CACHE_FLAGS="" | ||
+]) | ||
+AC_SUBST(STDLIB_CACHE_FLAGS) | ||
+ | ||
AC_MSG_CHECKING(for --enable-framework) | ||
if test "$enable_framework" | ||
then | ||
--- python3-3.3.0/Makefile.pre.in 2013-01-27 16:35:52.422067642 -0800 | ||
+++ python3-3.3.0/Makefile.pre.in 2013-01-27 16:37:03.710650439 -0800 | ||
@@ -143,6 +143,9 @@ | ||
# Options to enable prebinding (for fast startup prior to Mac OS X 10.3) | ||
OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@ | ||
|
||
+# Option to enable old-style precompiled stdlib | ||
+STDLIB_CACHE_FLAGS=@STDLIB_CACHE_FLAGS@ | ||
+ | ||
# Environment to run shared python without installed libraries | ||
RUNSHARED= @RUNSHARED@ | ||
|
||
@@ -1079,12 +1082,12 @@ | ||
fi | ||
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
- -d $(LIBDEST) -f \ | ||
+ -d $(LIBDEST) -f $(STDLIB_CACHE_FLAGS) \ | ||
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ | ||
$(DESTDIR)$(LIBDEST) | ||
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ | ||
- -d $(LIBDEST)/site-packages -f \ | ||
+ -d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \ | ||
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages | ||
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ | ||
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt |
This file contains 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