| commit | f10f4caf8831f4d5969385e59f6164e57e6cce3c | [log] [tgz] |
|---|---|---|
| author | R David Murray <rdmurray@bitdance.com> | Mon Mar 21 17:27:51 2011 -0400 |
| committer | R David Murray <rdmurray@bitdance.com> | Mon Mar 21 17:27:51 2011 -0400 |
| tree | 0341ba51f5e09149e8f3bfa01b2cb9641c75243a | |
| parent | 9aaba789b38834f40bb833735836a52237323be2 [diff] | |
| parent | cb157ab173d4bf72f6408ac3903cd7acb42103c2 [diff] |
Dummy merge to overlay fixed email.test move on top of borked move.
diff --git a/Lib/email/test/__init__.py b/Lib/email/test/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/Lib/email/test/__init__.py +++ /dev/null
diff --git a/Lib/test/test_email/__main__.py b/Lib/test/test_email/__main__.py deleted file mode 100644 index 98af9ec..0000000 --- a/Lib/test/test_email/__main__.py +++ /dev/null
@@ -1,3 +0,0 @@ -from test.test_email import test_main - -test_main()
diff --git a/Lib/email/test/data/PyBanner048.gif b/Lib/test/test_email/data/PyBanner048.gif similarity index 100% rename from Lib/email/test/data/PyBanner048.gif rename to Lib/test/test_email/data/PyBanner048.gif Binary files differ
diff --git a/Lib/email/test/data/audiotest.au b/Lib/test/test_email/data/audiotest.au similarity index 100% rename from Lib/email/test/data/audiotest.au rename to Lib/test/test_email/data/audiotest.au Binary files differ
diff --git a/Lib/test/test_email/torture_test.py b/Lib/test/test_email/tourture_test.py similarity index 100% rename from Lib/test/test_email/torture_test.py rename to Lib/test/test_email/tourture_test.py
