summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS.d/next/Library/2018-06-10-19-29-17.bpo-30167.G5EgC5.rst1
2 files changed, 2 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 481385f..96aad50 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 0000000..072a001
--- /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.