[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

Fri Oct 17 21:25:08 CEST 2014

https://hg.python.org/cpython/rev/51618c0482b2
changeset: 93111:51618c0482b2
parent: 93109:b7b49f26a87b
parent: 93110:adbc800c299a
user: Zachary Ware <zachary.ware at gmail.com>
date: Fri Oct 17 14:24:43 2014 -0500
summary:
 Merge with 3.4
files:
 Lib/test/test_ctypes.py | 5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_ctypes.py b/Lib/test/test_ctypes.py
--- a/Lib/test/test_ctypes.py
+++ b/Lib/test/test_ctypes.py
@@ -1,6 +1,9 @@
 import unittest
+from test.support import import_module
 
-from ctypes.test import load_tests
+ctypes_test = import_module('ctypes.test')
+
+load_tests = ctypes_test.load_tests
 
 if __name__ == "__main__":
 unittest.main()
-- 
Repository URL: https://hg.python.org/cpython
