first step in backout of bad default->3.5 merge d085b4f779af. Create new head and fix whitespace.

ned-deily · ned-deily · commit 6371152154bc · 2016-06-03T15:17:13.000-07:00
diff --git 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)
+warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`import warnings`
`2`	`2`
`3`		`-warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)`
	`3`	`+warnings.warn('module-level warning', DeprecationWarning, stacklevel=2)`