#11515: Merge with 3.1.

This commit is contained in:
Ezio Melotti 2011-03-15 05:59:46 +02:00
commit 4969f709cc
49 changed files with 58 additions and 58 deletions

View file

@ -758,7 +758,7 @@ class PyEnvironmentVariableTests(EnvironmentVariableTests):
class BootstrapTest(unittest.TestCase):
def test_issue_8766(self):
# "import encodings" emits a warning whereas the warnings is not loaded
# or not completly loaded (warnings imports indirectly encodings by
# or not completely loaded (warnings imports indirectly encodings by
# importing linecache) yet
with support.temp_cwd() as cwd, support.temp_cwd('encodings'):
env = os.environ.copy()