Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3k
Changeset: r78562:34a546ca0da4
Date: 2015-07-17 04:20 +0200
http://bitbucket.org/pypy/pypy/changeset/34a546ca0da4/
Log: Remove forgotten merge conflict marker and fix failing tests.
diff --git a/pypy/module/imp/test/test_import.py
b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -769,30 +769,29 @@
def test_import_star_finds_submodules_with___all__(self):
for case in ["not-imported-yet", "already-imported"]:
d = {}
- exec "from pkg.withall import *" in d
+ exec("from pkg.withall import *", d)
assert d["foobar"].found == 123
def test_import_star_does_not_find_submodules_without___all__(self):
for case in ["not-imported-yet", "already-imported"]:
d = {}
- exec "from pkg.withoutall import *" in d
+ exec("from pkg.withoutall import *", d)
assert "foobar" not in d
import pkg.withoutall.foobar # <- import it here only
for case in ["not-imported-yet", "already-imported"]:
d = {}
- exec "from pkg.withoutall import *" in d
+ exec("from pkg.withoutall import *", d)
assert d["foobar"].found == 123
def test_import_star_with_bogus___all__(self):
for case in ["not-imported-yet", "already-imported"]:
try:
- exec "from pkg.bogusall import *" in {}
+ exec("from pkg.bogusall import *", {})
except TypeError:
pass # 'int' object does not support indexing
else:
raise AssertionError("should have failed")
-<<<<<<< local
def test_source_encoding(self):
import imp
import encoded
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
