[Python-checkins] cpython (3.5): first step in backout of bad default->3.5 merge d085b4f779af. Create new head

[ned.deily]

https://hg.python.org/cpython/rev/48469527e407
changeset:   101666:48469527e407
branch:      3.5
parent:      101658:aed4b9981fca
user:        Ned Deily <nad at python.org>
date:        Fri Jun 03 15:17:13 2016 -0700
summary:
  first step in backout of bad default->3.5 merge d085b4f779af.  Create new head and fix whitespace.

files:
  Lib/test/test_warnings/data/import_warning.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_warnings/data/import_warning.py b/Lib/test/test_warnings/data/import_warning.py
--- a/Lib/test/test_warnings/data/import_warning.py
+++ b/Lib/test/test_warnings/data/import_warning.py
@@ -1,3 +1,3 @@
 import warnings
 
-warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)
\ No newline at end of file
+warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)

-- 
Repository URL: https://hg.python.org/cpython