[Python-checkins] cpython (merge 3.5 -> default): Closes #27407: Merge with 3.5

Mon Sep 5 14:03:56 EDT 2016

https://hg.python.org/cpython/rev/87f186cc6b80
changeset: 103050:87f186cc6b80
parent: 103046:1d7a938b1e47
parent: 103049:e0873191ad7d
user: Zachary Ware <zachary.ware at gmail.com>
date: Mon Sep 05 13:02:20 2016 -0500
summary:
 Closes #27407: Merge with 3.5
files:
 PCbuild/prepare_ssl.py | 7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
--- a/PCbuild/prepare_ssl.py
+++ b/PCbuild/prepare_ssl.py
@@ -18,6 +18,8 @@
 # it should configure OpenSSL such that it is ready to be built by
 # ssl.vcxproj on 32 or 64 bit platforms.
 
+from __future__ import print_function
+
 import os
 import re
 import sys
@@ -89,7 +91,10 @@
 
 def copy_includes(makefile, suffix):
 dir = 'include'+suffix+'\\openssl'
- os.makedirs(dir, exist_ok=True)
+ try:
+ os.makedirs(dir)
+ except OSError:
+ pass
 copy_if_different = r'$(PERL) $(SRC_D)\util\copy-if-different.pl'
 with open(makefile) as fin:
 for line in fin:
-- 
Repository URL: https://hg.python.org/cpython
