Revert "Fix error in coverage runs under Py3 with a C locale"
This reverts commit e0c489fd02
.
That commit was a workaround for old versions of the coverage package.
Fixes #1895
This commit is contained in:
parent
2ec7dca027
commit
c1ae51677b
|
@ -6,8 +6,8 @@ import traceback
|
|||
|
||||
from tornado.escape import utf8, native_str, to_unicode
|
||||
from tornado.template import Template, DictLoader, ParseError, Loader
|
||||
from tornado.test.util import unittest, is_coverage_running
|
||||
from tornado.util import ObjectDict, unicode_type, PY3
|
||||
from tornado.test.util import unittest
|
||||
from tornado.util import ObjectDict, unicode_type
|
||||
|
||||
|
||||
class TemplateTest(unittest.TestCase):
|
||||
|
@ -175,11 +175,6 @@ try{% set y = 1/x %}
|
|||
self.assertEqual(template.generate(), '0')
|
||||
|
||||
def test_non_ascii_name(self):
|
||||
if PY3 and is_coverage_running():
|
||||
try:
|
||||
os.fsencode(u"t\u00e9st.html")
|
||||
except UnicodeEncodeError:
|
||||
self.skipTest("coverage tries to access unencodable filename")
|
||||
loader = DictLoader({u"t\u00e9st.html": "hello"})
|
||||
self.assertEqual(loader.load(u"t\u00e9st.html").generate(), b"hello")
|
||||
|
||||
|
|
|
@ -97,24 +97,6 @@ def exec_test(caller_globals, caller_locals, s):
|
|||
return local_namespace
|
||||
|
||||
|
||||
def is_coverage_running():
|
||||
"""Return whether coverage is currently running.
|
||||
"""
|
||||
if 'coverage' not in sys.modules:
|
||||
return False
|
||||
tracer = sys.gettrace()
|
||||
if tracer is None:
|
||||
return False
|
||||
try:
|
||||
mod = tracer.__module__
|
||||
except AttributeError:
|
||||
try:
|
||||
mod = tracer.__class__.__module__
|
||||
except AttributeError:
|
||||
return False
|
||||
return mod.startswith('coverage')
|
||||
|
||||
|
||||
def subTest(test, *args, **kwargs):
|
||||
"""Compatibility shim for unittest.TestCase.subTest.
|
||||
|
||||
|
|
Loading…
Reference in New Issue