From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 7 Sep 2015 05:31:26 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1650
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45fd95155fb98021dad3c88db15ebe4e939577bf;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

45fd95155fb98021dad3c88db15ebe4e939577bf
diff --cc Lib/test/test_warnings/data/import_warning.py
index 000000000000,d6ea2ce1046e..32daec114045
mode 000000,100644..100644
--- a/Lib/test/test_warnings/data/import_warning.py
+++ b/Lib/test/test_warnings/data/import_warning.py
@@@ -1,0 -1,3 +1,3 @@@
+ import warnings
+ 
 -warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)
++warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)