[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #25800: Merge with 3.4

[zach.ware]

https://hg.python.org/cpython/rev/de4108db61f7
changeset:   99447:de4108db61f7
branch:      3.5
parent:      99443:a54ee6a65f10
parent:      99446:fae5186562d0
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Sat Dec 05 00:18:29 2015 -0600
summary:
  Issue #25800: Merge with 3.4

files:
  Lib/test/test_capi.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -343,7 +343,8 @@
 
 class EmbeddingTests(unittest.TestCase):
     def setUp(self):
-        basepath = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+        here = os.path.abspath(__file__)
+        basepath = os.path.dirname(os.path.dirname(os.path.dirname(here)))
         exename = "_testembed"
         if sys.platform.startswith("win"):
             ext = ("_d" if "_d" in sys.executable else "") + ".exe"

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