From: Steve Weber Date: Mon, 11 Jun 2018 00:49:34 +0000 (-0400) Subject: bpo-30167: Prevent site.main() exception if PYTHONSTARTUP is set. (GH-6731) X-Git-Tag: v3.8.0a1~1592 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2487f30d5529948ace26559e274d7cac6abcd1a8;p=python bpo-30167: Prevent site.main() exception if PYTHONSTARTUP is set. (GH-6731) Before Python 3.6, os.path.abspath(None) used to report an AttributeError which was properly caught inside site.abs_paths, making it ignore __main__, one of sys.modules, which has __file__ and __cached__ set to None. With 3.6, os.path.abspath(None) raises TypeError instead which site.abs_path was not expecting. This resulted in an uncaught exception if a user had PYTHONSTARTUP set and the application called site.main() which a number of third-party programs do. --- diff --git a/Lib/site.py b/Lib/site.py index 950e7038a5..4595244e2f 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -104,11 +104,11 @@ def abs_paths(): continue # don't mess with a PEP 302-supplied __file__ try: m.__file__ = os.path.abspath(m.__file__) - except (AttributeError, OSError): + except (AttributeError, OSError, TypeError): pass try: m.__cached__ = os.path.abspath(m.__cached__) - except (AttributeError, OSError): + except (AttributeError, OSError, TypeError): pass diff --git a/Misc/ACKS b/Misc/ACKS index 481385f36b..96aad5073a 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1721,6 +1721,7 @@ David Watson Aaron Watters Henrik Weber Leon Weber +Steve Weber Corran Webster Glyn Webster Phil Webster diff --git a/Misc/NEWS.d/next/Library/2018-06-10-19-29-17.bpo-30167.G5EgC5.rst b/Misc/NEWS.d/next/Library/2018-06-10-19-29-17.bpo-30167.G5EgC5.rst new file mode 100644 index 0000000000..072a001ada --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-10-19-29-17.bpo-30167.G5EgC5.rst @@ -0,0 +1 @@ +Prevent site.main() exception if PYTHONSTARTUP is set. Patch by Steve Weber.