2004-06-04 22:12:51 -03:00
|
|
|
"""Tests for 'site'.
|
|
|
|
|
|
|
|
Tests assume the initial paths in sys.path once the interpreter has begun
|
|
|
|
executing have not been removed.
|
|
|
|
|
|
|
|
"""
|
|
|
|
import unittest
|
2009-04-26 18:39:21 -03:00
|
|
|
from test.support import run_unittest, TESTFN, EnvironmentVarGuard
|
2007-12-02 05:40:06 -04:00
|
|
|
import builtins
|
2004-06-04 22:12:51 -03:00
|
|
|
import os
|
|
|
|
import sys
|
|
|
|
import encodings
|
2008-05-06 20:45:46 -03:00
|
|
|
import subprocess
|
2004-06-04 22:12:51 -03:00
|
|
|
# Need to make sure to not import 'site' if someone specified ``-S`` at the
|
|
|
|
# command-line. Detect this by just making sure 'site' has not been imported
|
|
|
|
# already.
|
|
|
|
if "site" in sys.modules:
|
|
|
|
import site
|
|
|
|
else:
|
Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70554 | benjamin.peterson | 2009-03-23 16:25:15 -0500 (Mon, 23 Mar 2009) | 1 line
complain when there's no last exception
........
r70588 | benjamin.peterson | 2009-03-24 17:56:32 -0500 (Tue, 24 Mar 2009) | 1 line
fix newline issue in test summary
........
r70589 | benjamin.peterson | 2009-03-24 18:07:07 -0500 (Tue, 24 Mar 2009) | 1 line
another style nit
........
r70598 | benjamin.peterson | 2009-03-25 16:24:04 -0500 (Wed, 25 Mar 2009) | 1 line
add shorthands for expected failures and unexpected success
........
r70605 | benjamin.peterson | 2009-03-26 11:32:23 -0500 (Thu, 26 Mar 2009) | 1 line
remove uneeded function
........
r70611 | benjamin.peterson | 2009-03-26 13:35:37 -0500 (Thu, 26 Mar 2009) | 1 line
add much better tests for python version information parsing
........
r70612 | benjamin.peterson | 2009-03-26 13:55:48 -0500 (Thu, 26 Mar 2009) | 1 line
more and more implementations now support sys.subversion
........
r70613 | benjamin.peterson | 2009-03-26 13:58:30 -0500 (Thu, 26 Mar 2009) | 1 line
roll old test in with new one
........
r70614 | benjamin.peterson | 2009-03-26 14:09:21 -0500 (Thu, 26 Mar 2009) | 1 line
add support for PyPy
........
r70615 | benjamin.peterson | 2009-03-26 14:58:18 -0500 (Thu, 26 Mar 2009) | 5 lines
add some useful utilities for skipping tests with unittest's new skipping ability
most significantly apply a modified portion of the patch from #4242 with
patches for skipping implementation details
........
r70616 | benjamin.peterson | 2009-03-26 15:05:50 -0500 (Thu, 26 Mar 2009) | 1 line
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571
........
r70617 | benjamin.peterson | 2009-03-26 15:17:27 -0500 (Thu, 26 Mar 2009) | 1 line
apply the second part of #4242's patch; classify all the implementation details in test_descr
........
r70618 | benjamin.peterson | 2009-03-26 15:48:25 -0500 (Thu, 26 Mar 2009) | 1 line
remove test_support.TestSkipped and just use unittest.SkipTest
........
r70619 | benjamin.peterson | 2009-03-26 15:49:40 -0500 (Thu, 26 Mar 2009) | 1 line
fix naming
........
r70620 | benjamin.peterson | 2009-03-26 16:10:30 -0500 (Thu, 26 Mar 2009) | 1 line
fix incorrect auto-translation of TestSkipped -> unittest.SkipTest
........
r70621 | benjamin.peterson | 2009-03-26 16:11:16 -0500 (Thu, 26 Mar 2009) | 1 line
must pass argument to get expected behavior ;)
........
r70623 | benjamin.peterson | 2009-03-26 16:30:10 -0500 (Thu, 26 Mar 2009) | 1 line
add missing import
........
r70624 | benjamin.peterson | 2009-03-26 16:30:54 -0500 (Thu, 26 Mar 2009) | 1 line
** is required here
........
r70626 | benjamin.peterson | 2009-03-26 16:40:29 -0500 (Thu, 26 Mar 2009) | 1 line
update email tests to use SkipTest
........
r70627 | benjamin.peterson | 2009-03-26 16:44:43 -0500 (Thu, 26 Mar 2009) | 1 line
fix another name
........
2009-03-28 18:42:05 -03:00
|
|
|
raise unittest.SkipTest("importation of site.py suppressed")
|
2004-06-04 22:12:51 -03:00
|
|
|
|
2008-05-06 20:45:46 -03:00
|
|
|
if not os.path.isdir(site.USER_SITE):
|
|
|
|
# need to add user site directory for tests
|
|
|
|
os.makedirs(site.USER_SITE)
|
|
|
|
site.addsitedir(site.USER_SITE)
|
|
|
|
|
2004-06-04 22:12:51 -03:00
|
|
|
class HelperFunctionsTests(unittest.TestCase):
|
|
|
|
"""Tests for helper functions.
|
2004-06-27 00:02:18 -03:00
|
|
|
|
2004-06-04 22:12:51 -03:00
|
|
|
The setting of the encoding (set using sys.setdefaultencoding) used by
|
|
|
|
the Unicode implementation is not tested.
|
2004-06-27 00:02:18 -03:00
|
|
|
|
2004-06-04 22:12:51 -03:00
|
|
|
"""
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
"""Save a copy of sys.path"""
|
|
|
|
self.sys_path = sys.path[:]
|
2009-08-20 18:28:05 -03:00
|
|
|
self.old_base = site.USER_BASE
|
|
|
|
self.old_site = site.USER_SITE
|
|
|
|
self.old_prefixes = site.PREFIXES
|
2004-06-04 22:12:51 -03:00
|
|
|
|
Merged revisions 63208-63209,63211-63212,63214-63217,63219-63224,63226-63227,63229-63232,63234-63235,63237-63239,63241,63243-63246,63250-63254,63256-63259,63261,63263-63264,63266-63267,63269-63270,63272-63273,63275-63276,63278,63280-63281,63283-63284,63286-63287,63289-63290,63292-63293,63295-63296,63298-63299,63301-63302,63304-63305,63307,63309-63314,63316-63322,63324-63325,63327-63335,63337-63338,63340-63342,63344-63346,63348 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63208 | georg.brandl | 2008-05-13 15:04:54 -0400 (Tue, 13 May 2008) | 2 lines
#2831: add start argument to enumerate(). Patch by Scott Dial and me.
........
r63209 | marc-andre.lemburg | 2008-05-13 15:10:45 -0400 (Tue, 13 May 2008) | 3 lines
Remove leftovers from reverted setuptools checkin (they were added in r45525).
........
r63211 | georg.brandl | 2008-05-13 17:32:03 -0400 (Tue, 13 May 2008) | 2 lines
Fix a refleak in the _warnings module.
........
r63212 | andrew.kuchling | 2008-05-13 20:46:41 -0400 (Tue, 13 May 2008) | 1 line
List all the removes and renamed modules
........
r63214 | brett.cannon | 2008-05-13 21:09:40 -0400 (Tue, 13 May 2008) | 2 lines
Rewrap some lines in test_py3kwarn.
........
r63219 | georg.brandl | 2008-05-14 02:34:15 -0400 (Wed, 14 May 2008) | 2 lines
Add NEWS entry for #2831.
........
r63220 | neal.norwitz | 2008-05-14 02:47:56 -0400 (Wed, 14 May 2008) | 3 lines
Fix "refleak" by restoring the tearDown method removed by accident (AFAICT)
in r62788.
........
r63221 | georg.brandl | 2008-05-14 03:18:22 -0400 (Wed, 14 May 2008) | 2 lines
Fix another "refleak" by clearing the filters after test.
........
r63222 | neal.norwitz | 2008-05-14 03:21:42 -0400 (Wed, 14 May 2008) | 5 lines
Install the json package and tests as well as the lib2to3 tests
so the tests work when run from an install directory.
They are currently skipped on the daily runs (not from the buildbots)
for checking refleaks, etc.
........
r63256 | andrew.kuchling | 2008-05-14 21:10:24 -0400 (Wed, 14 May 2008) | 1 line
Note some removals and a rename
........
r63311 | brett.cannon | 2008-05-15 00:36:53 -0400 (Thu, 15 May 2008) | 2 lines
Add a snippet for the deprecation directive for docs.
........
r63313 | gregory.p.smith | 2008-05-15 00:56:18 -0400 (Thu, 15 May 2008) | 5 lines
disable the crashing test. I will also file a bug. This crash does
not appear to be a new bug, its just that the test coverage went up
recently exposing it. (I verified that by testing this test code on
an older Modules/_bsddb.c)
........
r63320 | georg.brandl | 2008-05-15 11:08:32 -0400 (Thu, 15 May 2008) | 2 lines
#2863: add gen.__name__ and add this name to generator repr().
........
r63324 | andrew.kuchling | 2008-05-15 16:07:39 -0400 (Thu, 15 May 2008) | 1 line
Import class from distutils.cmd, not .core, to avoid circular import
........
r63327 | alexandre.vassalotti | 2008-05-15 16:31:42 -0400 (Thu, 15 May 2008) | 2 lines
Fixed typo in a doctest of test_genexps.
........
r63332 | benjamin.peterson | 2008-05-15 18:34:33 -0400 (Thu, 15 May 2008) | 2 lines
add Mac modules to the list of deprecated ones
........
r63333 | benjamin.peterson | 2008-05-15 18:41:16 -0400 (Thu, 15 May 2008) | 2 lines
fix typos in whatsnew
........
r63348 | benjamin.peterson | 2008-05-15 22:24:49 -0400 (Thu, 15 May 2008) | 2 lines
make test_platform a bit more assertive (We'll see what the buildbots say.)
........
2008-05-16 01:39:54 -03:00
|
|
|
def tearDown(self):
|
2004-06-04 22:12:51 -03:00
|
|
|
"""Restore sys.path"""
|
Note that a number of the changes listed below were not applicable to the Py3k branch, and hence the corresponding
files are unchanged in this checkin. This checkin is also the first time the environment checking in regrtest has
been forward ported to the Py3k branch.
This checkin causes test_xmlrpc to fail - see issue 7165 (it's a bug in the 3.x version of xmlrpc.server)
I am also getting a failure in test_telnetlib, but it isn't clear yet if that is due to these changes.
Recorded merge of revisions 75400-75401,75404,75406,75414,75416,75422,75425-75428,75435,75439,75441-75444,75447-75449,75451-75453,75455-75458,75460-75469,75471-75473,75475-75477,75479-75481,75483,75486-75489 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75400 | r.david.murray | 2009-10-14 23:58:07 +1000 (Wed, 14 Oct 2009) | 6 lines
Enhanced Issue 7058 patch, which will not be backported. Refactors the
code, adds checks for stdin/out/err, cwd, and sys.path, and adds a new
section in the summary for tests that modify the environment (thanks to
Ezio Melotti for that suggestion).
........
r75453 | nick.coghlan | 2009-10-17 16:33:05 +1000 (Sat, 17 Oct 2009) | 1 line
Correctly restore sys.stdout in test_descr
........
r75456 | nick.coghlan | 2009-10-17 17:30:40 +1000 (Sat, 17 Oct 2009) | 1 line
Enhancement to the new environment checking code to print the changed items under -vv. Also includes a small tweak to allow underscores in the names of resources.
........
r75457 | nick.coghlan | 2009-10-17 17:34:27 +1000 (Sat, 17 Oct 2009) | 1 line
Formatting tweak so that before and after values are vertically aligned
........
r75458 | nick.coghlan | 2009-10-17 18:21:21 +1000 (Sat, 17 Oct 2009) | 1 line
Check and revert expected sys.path alterations
........
r75461 | nick.coghlan | 2009-10-18 00:40:54 +1000 (Sun, 18 Oct 2009) | 1 line
Restore original sys.path when running TTK tests
........
r75462 | nick.coghlan | 2009-10-18 01:09:41 +1000 (Sun, 18 Oct 2009) | 1 line
Don't invoke reload(sys) and use StringIO objects instead of real files to capture stdin and stdout when needed (ensures all sys attributes remain unmodified after test_xmlrpc runs)
........
r75463 | nick.coghlan | 2009-10-18 01:23:08 +1000 (Sun, 18 Oct 2009) | 1 line
Revert changes made to environment in test_httpservers
........
r75465 | nick.coghlan | 2009-10-18 01:45:52 +1000 (Sun, 18 Oct 2009) | 1 line
Move restoration of the os.environ object into the context manager where it belongs
........
r75466 | nick.coghlan | 2009-10-18 01:48:16 +1000 (Sun, 18 Oct 2009) | 1 line
Also check and restore identity of sys.path, sys.argv and os.environ rather than just their values (this picked up a few more misbehaving tests)
........
r75467 | nick.coghlan | 2009-10-18 01:57:42 +1000 (Sun, 18 Oct 2009) | 1 line
Avoid replacing existing modules and sys.path in import tests
........
r75468 | nick.coghlan | 2009-10-18 02:19:51 +1000 (Sun, 18 Oct 2009) | 1 line
Don't replace sys.path in test_site
........
r75481 | nick.coghlan | 2009-10-18 15:38:48 +1000 (Sun, 18 Oct 2009) | 1 line
Using CleanImport to revert a reload of the os module doesn't work due to function registrations in copy_reg. The perils of reloading modules even for tests...
........
r75486 | nick.coghlan | 2009-10-18 20:29:10 +1000 (Sun, 18 Oct 2009) | 1 line
Silence a deprecation warning by using the appropriate replacement construct
........
r75489 | nick.coghlan | 2009-10-18 20:56:21 +1000 (Sun, 18 Oct 2009) | 1 line
Restore sys.path in test_tk
........
2009-10-18 10:19:33 -03:00
|
|
|
sys.path[:] = self.sys_path
|
2009-08-20 18:28:05 -03:00
|
|
|
site.USER_BASE = self.old_base
|
|
|
|
site.USER_SITE = self.old_site
|
|
|
|
site.PREFIXES = self.old_prefixes
|
2004-06-27 00:02:18 -03:00
|
|
|
|
2004-06-04 22:12:51 -03:00
|
|
|
def test_makepath(self):
|
|
|
|
# Test makepath() have an absolute path for its first return value
|
|
|
|
# and a case-normalized version of the absolute path for its
|
|
|
|
# second value.
|
|
|
|
path_parts = ("Beginning", "End")
|
|
|
|
original_dir = os.path.join(*path_parts)
|
|
|
|
abs_dir, norm_dir = site.makepath(*path_parts)
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertEqual(os.path.abspath(original_dir), abs_dir)
|
2004-06-04 22:12:51 -03:00
|
|
|
if original_dir == os.path.normcase(original_dir):
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertEqual(abs_dir, norm_dir)
|
2004-06-04 22:12:51 -03:00
|
|
|
else:
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertEqual(os.path.normcase(abs_dir), norm_dir)
|
2004-06-04 22:12:51 -03:00
|
|
|
|
|
|
|
def test_init_pathinfo(self):
|
|
|
|
dir_set = site._init_pathinfo()
|
|
|
|
for entry in [site.makepath(path)[1] for path in sys.path
|
|
|
|
if path and os.path.isdir(path)]:
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(entry in dir_set,
|
2004-06-04 22:12:51 -03:00
|
|
|
"%s from sys.path not found in set returned "
|
|
|
|
"by _init_pathinfo(): %s" % (entry, dir_set))
|
2004-06-27 00:02:18 -03:00
|
|
|
|
2004-07-13 04:12:25 -03:00
|
|
|
def pth_file_tests(self, pth_file):
|
|
|
|
"""Contain common code for testing results of reading a .pth file"""
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(pth_file.imported in sys.modules,
|
2009-11-01 19:55:40 -04:00
|
|
|
"%s not in sys.modules" % pth_file.imported)
|
|
|
|
self.assertIn(site.makepath(pth_file.good_dir_path)[0], sys.path)
|
|
|
|
self.assertFalse(os.path.exists(pth_file.bad_dir_path))
|
2004-07-13 04:12:25 -03:00
|
|
|
|
2004-06-04 22:12:51 -03:00
|
|
|
def test_addpackage(self):
|
|
|
|
# Make sure addpackage() imports if the line starts with 'import',
|
2004-07-09 23:10:45 -03:00
|
|
|
# adds directories to sys.path for any line in the file that is not a
|
|
|
|
# comment or import that is a valid directory name for where the .pth
|
|
|
|
# file resides; invalid directories are not added
|
|
|
|
pth_file = PthFile()
|
2004-07-13 04:12:25 -03:00
|
|
|
pth_file.cleanup(prep=True) # to make sure that nothing is
|
|
|
|
# pre-existing that shouldn't be
|
2004-06-04 22:12:51 -03:00
|
|
|
try:
|
2004-07-09 23:10:45 -03:00
|
|
|
pth_file.create()
|
|
|
|
site.addpackage(pth_file.base_dir, pth_file.filename, set())
|
2004-07-13 04:12:25 -03:00
|
|
|
self.pth_file_tests(pth_file)
|
2004-06-04 22:12:51 -03:00
|
|
|
finally:
|
2004-07-09 23:10:45 -03:00
|
|
|
pth_file.cleanup()
|
2004-06-27 00:02:18 -03:00
|
|
|
|
2004-06-04 22:12:51 -03:00
|
|
|
def test_addsitedir(self):
|
2004-07-09 23:10:45 -03:00
|
|
|
# Same tests for test_addpackage since addsitedir() essentially just
|
|
|
|
# calls addpackage() for every .pth file in the directory
|
|
|
|
pth_file = PthFile()
|
2004-07-13 04:12:25 -03:00
|
|
|
pth_file.cleanup(prep=True) # Make sure that nothing is pre-existing
|
|
|
|
# that is tested for
|
2004-06-04 22:12:51 -03:00
|
|
|
try:
|
2004-07-13 04:12:25 -03:00
|
|
|
pth_file.create()
|
2004-07-09 23:10:45 -03:00
|
|
|
site.addsitedir(pth_file.base_dir, set())
|
2004-07-13 04:12:25 -03:00
|
|
|
self.pth_file_tests(pth_file)
|
2004-06-04 22:12:51 -03:00
|
|
|
finally:
|
2004-07-09 23:10:45 -03:00
|
|
|
pth_file.cleanup()
|
|
|
|
|
2008-05-06 20:45:46 -03:00
|
|
|
def test_s_option(self):
|
|
|
|
usersite = site.USER_SITE
|
2009-11-01 19:55:40 -04:00
|
|
|
self.assertIn(usersite, sys.path)
|
2008-05-06 20:45:46 -03:00
|
|
|
|
|
|
|
rc = subprocess.call([sys.executable, '-c',
|
Merged revisions 64365,64370,64406,64408-64409,64412,64416-64417,64420-64421,64425-64428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64365 | raymond.hettinger | 2008-06-17 19:56:57 -0500 (Tue, 17 Jun 2008) | 1 line
Fix double decref.
........
r64370 | mark.dickinson | 2008-06-18 04:20:17 -0500 (Wed, 18 Jun 2008) | 2 lines
Typo fix
........
r64406 | andrew.kuchling | 2008-06-19 09:02:30 -0500 (Thu, 19 Jun 2008) | 1 line
Only include update_lines_cols() function when it's actually going to be used
........
r64408 | amaury.forgeotdarc | 2008-06-19 14:57:39 -0500 (Thu, 19 Jun 2008) | 2 lines
test_macos can be skipped on non-mac platforms.
........
r64409 | andrew.kuchling | 2008-06-19 15:33:31 -0500 (Thu, 19 Jun 2008) | 1 line
Put threading in front of thread
........
r64412 | amaury.forgeotdarc | 2008-06-19 16:17:12 -0500 (Thu, 19 Jun 2008) | 3 lines
In test_site, correctly escape backslashes in path names.
This allows the test to pass when the username begins with a lowercase 't'...
........
r64416 | vinay.sajip | 2008-06-19 17:40:17 -0500 (Thu, 19 Jun 2008) | 2 lines
Bug #3136: fileConfig()'s disabling of old loggers is now conditional via an optional disable_existing_loggers parameter, but the default value is such that the old behaviour is preserved.
Thanks to Leandro Lucarella for the patch.
........
r64417 | vinay.sajip | 2008-06-19 17:41:08 -0500 (Thu, 19 Jun 2008) | 1 line
Updated with fix for #3136.
........
r64420 | andrew.kuchling | 2008-06-19 21:05:57 -0500 (Thu, 19 Jun 2008) | 1 line
Various items
........
r64421 | andrew.kuchling | 2008-06-19 21:11:42 -0500 (Thu, 19 Jun 2008) | 1 line
Fix comment typos
........
r64425 | andrew.kuchling | 2008-06-20 06:39:54 -0500 (Fri, 20 Jun 2008) | 1 line
Various items
........
r64426 | mark.dickinson | 2008-06-20 09:53:43 -0500 (Fri, 20 Jun 2008) | 4 lines
Issue #3004: Minor fix to slice.indices(). slice(-10).indices(9) now
returns (0, 0, 1) instead of (0, -1, 1), and slice(None, 10, -1).indices(10)
returns (9, 9, -1) instead of (9, 10, -1).
........
r64427 | mark.dickinson | 2008-06-20 10:17:41 -0500 (Fri, 20 Jun 2008) | 2 lines
Fix outdated count of the number of new math module functions.
........
r64428 | mark.dickinson | 2008-06-20 10:26:19 -0500 (Fri, 20 Jun 2008) | 2 lines
Fix another typo in math_sum comment
........
2008-07-02 13:11:42 -03:00
|
|
|
'import sys; sys.exit(%r in sys.path)' % usersite])
|
2008-05-06 20:45:46 -03:00
|
|
|
self.assertEqual(rc, 1)
|
|
|
|
|
|
|
|
rc = subprocess.call([sys.executable, '-s', '-c',
|
Merged revisions 64365,64370,64406,64408-64409,64412,64416-64417,64420-64421,64425-64428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64365 | raymond.hettinger | 2008-06-17 19:56:57 -0500 (Tue, 17 Jun 2008) | 1 line
Fix double decref.
........
r64370 | mark.dickinson | 2008-06-18 04:20:17 -0500 (Wed, 18 Jun 2008) | 2 lines
Typo fix
........
r64406 | andrew.kuchling | 2008-06-19 09:02:30 -0500 (Thu, 19 Jun 2008) | 1 line
Only include update_lines_cols() function when it's actually going to be used
........
r64408 | amaury.forgeotdarc | 2008-06-19 14:57:39 -0500 (Thu, 19 Jun 2008) | 2 lines
test_macos can be skipped on non-mac platforms.
........
r64409 | andrew.kuchling | 2008-06-19 15:33:31 -0500 (Thu, 19 Jun 2008) | 1 line
Put threading in front of thread
........
r64412 | amaury.forgeotdarc | 2008-06-19 16:17:12 -0500 (Thu, 19 Jun 2008) | 3 lines
In test_site, correctly escape backslashes in path names.
This allows the test to pass when the username begins with a lowercase 't'...
........
r64416 | vinay.sajip | 2008-06-19 17:40:17 -0500 (Thu, 19 Jun 2008) | 2 lines
Bug #3136: fileConfig()'s disabling of old loggers is now conditional via an optional disable_existing_loggers parameter, but the default value is such that the old behaviour is preserved.
Thanks to Leandro Lucarella for the patch.
........
r64417 | vinay.sajip | 2008-06-19 17:41:08 -0500 (Thu, 19 Jun 2008) | 1 line
Updated with fix for #3136.
........
r64420 | andrew.kuchling | 2008-06-19 21:05:57 -0500 (Thu, 19 Jun 2008) | 1 line
Various items
........
r64421 | andrew.kuchling | 2008-06-19 21:11:42 -0500 (Thu, 19 Jun 2008) | 1 line
Fix comment typos
........
r64425 | andrew.kuchling | 2008-06-20 06:39:54 -0500 (Fri, 20 Jun 2008) | 1 line
Various items
........
r64426 | mark.dickinson | 2008-06-20 09:53:43 -0500 (Fri, 20 Jun 2008) | 4 lines
Issue #3004: Minor fix to slice.indices(). slice(-10).indices(9) now
returns (0, 0, 1) instead of (0, -1, 1), and slice(None, 10, -1).indices(10)
returns (9, 9, -1) instead of (9, 10, -1).
........
r64427 | mark.dickinson | 2008-06-20 10:17:41 -0500 (Fri, 20 Jun 2008) | 2 lines
Fix outdated count of the number of new math module functions.
........
r64428 | mark.dickinson | 2008-06-20 10:26:19 -0500 (Fri, 20 Jun 2008) | 2 lines
Fix another typo in math_sum comment
........
2008-07-02 13:11:42 -03:00
|
|
|
'import sys; sys.exit(%r in sys.path)' % usersite])
|
2008-05-06 20:45:46 -03:00
|
|
|
self.assertEqual(rc, 0)
|
|
|
|
|
|
|
|
env = os.environ.copy()
|
|
|
|
env["PYTHONNOUSERSITE"] = "1"
|
|
|
|
rc = subprocess.call([sys.executable, '-c',
|
Merged revisions 64365,64370,64406,64408-64409,64412,64416-64417,64420-64421,64425-64428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64365 | raymond.hettinger | 2008-06-17 19:56:57 -0500 (Tue, 17 Jun 2008) | 1 line
Fix double decref.
........
r64370 | mark.dickinson | 2008-06-18 04:20:17 -0500 (Wed, 18 Jun 2008) | 2 lines
Typo fix
........
r64406 | andrew.kuchling | 2008-06-19 09:02:30 -0500 (Thu, 19 Jun 2008) | 1 line
Only include update_lines_cols() function when it's actually going to be used
........
r64408 | amaury.forgeotdarc | 2008-06-19 14:57:39 -0500 (Thu, 19 Jun 2008) | 2 lines
test_macos can be skipped on non-mac platforms.
........
r64409 | andrew.kuchling | 2008-06-19 15:33:31 -0500 (Thu, 19 Jun 2008) | 1 line
Put threading in front of thread
........
r64412 | amaury.forgeotdarc | 2008-06-19 16:17:12 -0500 (Thu, 19 Jun 2008) | 3 lines
In test_site, correctly escape backslashes in path names.
This allows the test to pass when the username begins with a lowercase 't'...
........
r64416 | vinay.sajip | 2008-06-19 17:40:17 -0500 (Thu, 19 Jun 2008) | 2 lines
Bug #3136: fileConfig()'s disabling of old loggers is now conditional via an optional disable_existing_loggers parameter, but the default value is such that the old behaviour is preserved.
Thanks to Leandro Lucarella for the patch.
........
r64417 | vinay.sajip | 2008-06-19 17:41:08 -0500 (Thu, 19 Jun 2008) | 1 line
Updated with fix for #3136.
........
r64420 | andrew.kuchling | 2008-06-19 21:05:57 -0500 (Thu, 19 Jun 2008) | 1 line
Various items
........
r64421 | andrew.kuchling | 2008-06-19 21:11:42 -0500 (Thu, 19 Jun 2008) | 1 line
Fix comment typos
........
r64425 | andrew.kuchling | 2008-06-20 06:39:54 -0500 (Fri, 20 Jun 2008) | 1 line
Various items
........
r64426 | mark.dickinson | 2008-06-20 09:53:43 -0500 (Fri, 20 Jun 2008) | 4 lines
Issue #3004: Minor fix to slice.indices(). slice(-10).indices(9) now
returns (0, 0, 1) instead of (0, -1, 1), and slice(None, 10, -1).indices(10)
returns (9, 9, -1) instead of (9, 10, -1).
........
r64427 | mark.dickinson | 2008-06-20 10:17:41 -0500 (Fri, 20 Jun 2008) | 2 lines
Fix outdated count of the number of new math module functions.
........
r64428 | mark.dickinson | 2008-06-20 10:26:19 -0500 (Fri, 20 Jun 2008) | 2 lines
Fix another typo in math_sum comment
........
2008-07-02 13:11:42 -03:00
|
|
|
'import sys; sys.exit(%r in sys.path)' % usersite],
|
2008-05-06 20:45:46 -03:00
|
|
|
env=env)
|
|
|
|
self.assertEqual(rc, 0)
|
|
|
|
|
|
|
|
env = os.environ.copy()
|
|
|
|
env["PYTHONUSERBASE"] = "/tmp"
|
|
|
|
rc = subprocess.call([sys.executable, '-c',
|
|
|
|
'import sys, site; sys.exit(site.USER_BASE.startswith("/tmp"))'],
|
|
|
|
env=env)
|
|
|
|
self.assertEqual(rc, 1)
|
|
|
|
|
2009-08-20 18:28:05 -03:00
|
|
|
def test_getuserbase(self):
|
|
|
|
site.USER_BASE = None
|
|
|
|
user_base = site.getuserbase()
|
|
|
|
|
|
|
|
# the call sets site.USER_BASE
|
|
|
|
self.assertEquals(site.USER_BASE, user_base)
|
|
|
|
|
|
|
|
# let's set PYTHONUSERBASE and see if it uses it
|
|
|
|
site.USER_BASE = None
|
|
|
|
with EnvironmentVarGuard() as environ:
|
|
|
|
environ['PYTHONUSERBASE'] = 'xoxo'
|
2009-11-01 19:55:40 -04:00
|
|
|
self.assertTrue(site.getuserbase().startswith('xoxo'),
|
|
|
|
site.getuserbase())
|
2009-08-20 18:28:05 -03:00
|
|
|
|
|
|
|
def test_getusersitepackages(self):
|
|
|
|
site.USER_SITE = None
|
|
|
|
site.USER_BASE = None
|
|
|
|
user_site = site.getusersitepackages()
|
|
|
|
|
|
|
|
# the call sets USER_BASE *and* USER_SITE
|
|
|
|
self.assertEquals(site.USER_SITE, user_site)
|
2009-11-01 19:55:40 -04:00
|
|
|
self.assertTrue(user_site.startswith(site.USER_BASE), user_site)
|
2009-08-20 18:28:05 -03:00
|
|
|
|
|
|
|
def test_getsitepackages(self):
|
|
|
|
site.PREFIXES = ['xoxo']
|
|
|
|
dirs = site.getsitepackages()
|
|
|
|
|
|
|
|
if sys.platform in ('os2emx', 'riscos'):
|
2009-11-01 19:55:40 -04:00
|
|
|
self.assertEqual(len(dirs), 1)
|
2009-08-20 18:28:05 -03:00
|
|
|
wanted = os.path.join('xoxo', 'Lib', 'site-packages')
|
|
|
|
self.assertEquals(dirs[0], wanted)
|
|
|
|
elif os.sep == '/':
|
|
|
|
self.assertTrue(len(dirs), 2)
|
|
|
|
wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
|
|
|
|
'site-packages')
|
|
|
|
self.assertEquals(dirs[0], wanted)
|
|
|
|
wanted = os.path.join('xoxo', 'lib', 'site-python')
|
|
|
|
self.assertEquals(dirs[1], wanted)
|
|
|
|
else:
|
|
|
|
self.assertTrue(len(dirs), 2)
|
|
|
|
self.assertEquals(dirs[0], 'xoxo')
|
2009-10-27 18:24:21 -03:00
|
|
|
wanted = os.path.join('xoxo', 'lib', 'site-packages')
|
2009-08-20 18:28:05 -03:00
|
|
|
self.assertEquals(dirs[1], wanted)
|
|
|
|
|
|
|
|
# let's try the specific Apple location
|
|
|
|
if sys.platform == "darwin":
|
|
|
|
site.PREFIXES = ['Python.framework']
|
|
|
|
dirs = site.getsitepackages()
|
2009-11-01 19:55:40 -04:00
|
|
|
self.assertEqual(len(dirs), 4)
|
2009-08-20 18:28:05 -03:00
|
|
|
wanted = os.path.join('~', 'Library', 'Python',
|
|
|
|
sys.version[:3], 'site-packages')
|
|
|
|
self.assertEquals(dirs[2], os.path.expanduser(wanted))
|
|
|
|
wanted = os.path.join('/Library', 'Python', sys.version[:3],
|
|
|
|
'site-packages')
|
|
|
|
self.assertEquals(dirs[3], wanted)
|
2008-05-06 20:45:46 -03:00
|
|
|
|
2004-07-09 23:10:45 -03:00
|
|
|
class PthFile(object):
|
|
|
|
"""Helper class for handling testing of .pth files"""
|
|
|
|
|
|
|
|
def __init__(self, filename_base=TESTFN, imported="time",
|
|
|
|
good_dirname="__testdir__", bad_dirname="__bad"):
|
|
|
|
"""Initialize instance variables"""
|
|
|
|
self.filename = filename_base + ".pth"
|
|
|
|
self.base_dir = os.path.abspath('')
|
|
|
|
self.file_path = os.path.join(self.base_dir, self.filename)
|
2004-07-13 04:12:25 -03:00
|
|
|
self.imported = imported
|
2004-07-09 23:10:45 -03:00
|
|
|
self.good_dirname = good_dirname
|
|
|
|
self.bad_dirname = bad_dirname
|
|
|
|
self.good_dir_path = os.path.join(self.base_dir, self.good_dirname)
|
|
|
|
self.bad_dir_path = os.path.join(self.base_dir, self.bad_dirname)
|
|
|
|
|
|
|
|
def create(self):
|
|
|
|
"""Create a .pth file with a comment, blank lines, an ``import
|
|
|
|
<self.imported>``, a line with self.good_dirname, and a line with
|
|
|
|
self.bad_dirname.
|
2004-07-18 03:16:08 -03:00
|
|
|
|
2004-07-09 23:10:45 -03:00
|
|
|
Creation of the directory for self.good_dir_path (based off of
|
|
|
|
self.good_dirname) is also performed.
|
|
|
|
|
|
|
|
Make sure to call self.cleanup() to undo anything done by this method.
|
2004-07-18 03:16:08 -03:00
|
|
|
|
2004-07-09 23:10:45 -03:00
|
|
|
"""
|
2005-05-27 11:58:06 -03:00
|
|
|
FILE = open(self.file_path, 'w')
|
2004-07-09 23:10:45 -03:00
|
|
|
try:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("#import @bad module name", file=FILE)
|
|
|
|
print("\n", file=FILE)
|
|
|
|
print("import %s" % self.imported, file=FILE)
|
|
|
|
print(self.good_dirname, file=FILE)
|
|
|
|
print(self.bad_dirname, file=FILE)
|
2004-07-09 23:10:45 -03:00
|
|
|
finally:
|
|
|
|
FILE.close()
|
|
|
|
os.mkdir(self.good_dir_path)
|
2004-06-04 22:12:51 -03:00
|
|
|
|
2004-07-13 04:12:25 -03:00
|
|
|
def cleanup(self, prep=False):
|
2004-07-09 23:10:45 -03:00
|
|
|
"""Make sure that the .pth file is deleted, self.imported is not in
|
|
|
|
sys.modules, and that both self.good_dirname and self.bad_dirname are
|
|
|
|
not existing directories."""
|
2004-07-13 04:12:25 -03:00
|
|
|
if os.path.exists(self.file_path):
|
2004-07-09 23:10:45 -03:00
|
|
|
os.remove(self.file_path)
|
2004-07-13 04:12:25 -03:00
|
|
|
if prep:
|
|
|
|
self.imported_module = sys.modules.get(self.imported)
|
|
|
|
if self.imported_module:
|
|
|
|
del sys.modules[self.imported]
|
|
|
|
else:
|
|
|
|
if self.imported_module:
|
|
|
|
sys.modules[self.imported] = self.imported_module
|
|
|
|
if os.path.exists(self.good_dir_path):
|
2004-07-09 23:10:45 -03:00
|
|
|
os.rmdir(self.good_dir_path)
|
2004-07-13 04:12:25 -03:00
|
|
|
if os.path.exists(self.bad_dir_path):
|
2004-07-09 23:10:45 -03:00
|
|
|
os.rmdir(self.bad_dir_path)
|
2004-06-04 22:12:51 -03:00
|
|
|
|
|
|
|
class ImportSideEffectTests(unittest.TestCase):
|
|
|
|
"""Test side-effects from importing 'site'."""
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
"""Make a copy of sys.path"""
|
|
|
|
self.sys_path = sys.path[:]
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
"""Restore sys.path"""
|
Note that a number of the changes listed below were not applicable to the Py3k branch, and hence the corresponding
files are unchanged in this checkin. This checkin is also the first time the environment checking in regrtest has
been forward ported to the Py3k branch.
This checkin causes test_xmlrpc to fail - see issue 7165 (it's a bug in the 3.x version of xmlrpc.server)
I am also getting a failure in test_telnetlib, but it isn't clear yet if that is due to these changes.
Recorded merge of revisions 75400-75401,75404,75406,75414,75416,75422,75425-75428,75435,75439,75441-75444,75447-75449,75451-75453,75455-75458,75460-75469,75471-75473,75475-75477,75479-75481,75483,75486-75489 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75400 | r.david.murray | 2009-10-14 23:58:07 +1000 (Wed, 14 Oct 2009) | 6 lines
Enhanced Issue 7058 patch, which will not be backported. Refactors the
code, adds checks for stdin/out/err, cwd, and sys.path, and adds a new
section in the summary for tests that modify the environment (thanks to
Ezio Melotti for that suggestion).
........
r75453 | nick.coghlan | 2009-10-17 16:33:05 +1000 (Sat, 17 Oct 2009) | 1 line
Correctly restore sys.stdout in test_descr
........
r75456 | nick.coghlan | 2009-10-17 17:30:40 +1000 (Sat, 17 Oct 2009) | 1 line
Enhancement to the new environment checking code to print the changed items under -vv. Also includes a small tweak to allow underscores in the names of resources.
........
r75457 | nick.coghlan | 2009-10-17 17:34:27 +1000 (Sat, 17 Oct 2009) | 1 line
Formatting tweak so that before and after values are vertically aligned
........
r75458 | nick.coghlan | 2009-10-17 18:21:21 +1000 (Sat, 17 Oct 2009) | 1 line
Check and revert expected sys.path alterations
........
r75461 | nick.coghlan | 2009-10-18 00:40:54 +1000 (Sun, 18 Oct 2009) | 1 line
Restore original sys.path when running TTK tests
........
r75462 | nick.coghlan | 2009-10-18 01:09:41 +1000 (Sun, 18 Oct 2009) | 1 line
Don't invoke reload(sys) and use StringIO objects instead of real files to capture stdin and stdout when needed (ensures all sys attributes remain unmodified after test_xmlrpc runs)
........
r75463 | nick.coghlan | 2009-10-18 01:23:08 +1000 (Sun, 18 Oct 2009) | 1 line
Revert changes made to environment in test_httpservers
........
r75465 | nick.coghlan | 2009-10-18 01:45:52 +1000 (Sun, 18 Oct 2009) | 1 line
Move restoration of the os.environ object into the context manager where it belongs
........
r75466 | nick.coghlan | 2009-10-18 01:48:16 +1000 (Sun, 18 Oct 2009) | 1 line
Also check and restore identity of sys.path, sys.argv and os.environ rather than just their values (this picked up a few more misbehaving tests)
........
r75467 | nick.coghlan | 2009-10-18 01:57:42 +1000 (Sun, 18 Oct 2009) | 1 line
Avoid replacing existing modules and sys.path in import tests
........
r75468 | nick.coghlan | 2009-10-18 02:19:51 +1000 (Sun, 18 Oct 2009) | 1 line
Don't replace sys.path in test_site
........
r75481 | nick.coghlan | 2009-10-18 15:38:48 +1000 (Sun, 18 Oct 2009) | 1 line
Using CleanImport to revert a reload of the os module doesn't work due to function registrations in copy_reg. The perils of reloading modules even for tests...
........
r75486 | nick.coghlan | 2009-10-18 20:29:10 +1000 (Sun, 18 Oct 2009) | 1 line
Silence a deprecation warning by using the appropriate replacement construct
........
r75489 | nick.coghlan | 2009-10-18 20:56:21 +1000 (Sun, 18 Oct 2009) | 1 line
Restore sys.path in test_tk
........
2009-10-18 10:19:33 -03:00
|
|
|
sys.path[:] = self.sys_path
|
2004-06-04 22:12:51 -03:00
|
|
|
|
|
|
|
def test_abs__file__(self):
|
|
|
|
# Make sure all imported modules have their __file__ attribute
|
|
|
|
# as an absolute path.
|
|
|
|
# Handled by abs__file__()
|
|
|
|
site.abs__file__()
|
2007-12-02 05:40:06 -04:00
|
|
|
for module in (sys, os, builtins):
|
2004-06-04 22:12:51 -03:00
|
|
|
try:
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(os.path.isabs(module.__file__), repr(module))
|
2004-06-04 22:12:51 -03:00
|
|
|
except AttributeError:
|
|
|
|
continue
|
2004-06-27 00:02:18 -03:00
|
|
|
# We could try everything in sys.modules; however, when regrtest.py
|
|
|
|
# runs something like test_frozen before test_site, then we will
|
|
|
|
# be testing things loaded *after* test_site did path normalization
|
2004-06-04 22:12:51 -03:00
|
|
|
|
|
|
|
def test_no_duplicate_paths(self):
|
|
|
|
# No duplicate paths should exist in sys.path
|
|
|
|
# Handled by removeduppaths()
|
|
|
|
site.removeduppaths()
|
|
|
|
seen_paths = set()
|
|
|
|
for path in sys.path:
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(path not in seen_paths)
|
2004-06-04 22:12:51 -03:00
|
|
|
seen_paths.add(path)
|
|
|
|
|
|
|
|
def test_add_build_dir(self):
|
|
|
|
# Test that the build directory's Modules directory is used when it
|
|
|
|
# should be.
|
|
|
|
# XXX: implement
|
|
|
|
pass
|
|
|
|
|
|
|
|
def test_setting_quit(self):
|
2007-12-02 05:40:06 -04:00
|
|
|
# 'quit' and 'exit' should be injected into builtins
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(hasattr(builtins, "quit"))
|
|
|
|
self.assertTrue(hasattr(builtins, "exit"))
|
2004-06-04 22:12:51 -03:00
|
|
|
|
|
|
|
def test_setting_copyright(self):
|
2007-12-02 05:40:06 -04:00
|
|
|
# 'copyright' and 'credits' should be in builtins
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(hasattr(builtins, "copyright"))
|
|
|
|
self.assertTrue(hasattr(builtins, "credits"))
|
2004-06-04 22:12:51 -03:00
|
|
|
|
|
|
|
def test_setting_help(self):
|
2007-12-02 05:40:06 -04:00
|
|
|
# 'help' should be set in builtins
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(hasattr(builtins, "help"))
|
2004-06-04 22:12:51 -03:00
|
|
|
|
|
|
|
def test_aliasing_mbcs(self):
|
|
|
|
if sys.platform == "win32":
|
|
|
|
import locale
|
|
|
|
if locale.getdefaultlocale()[1].startswith('cp'):
|
2007-02-11 02:12:03 -04:00
|
|
|
for value in encodings.aliases.aliases.values():
|
2004-06-04 22:12:51 -03:00
|
|
|
if value == "mbcs":
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
self.fail("did not alias mbcs")
|
|
|
|
|
|
|
|
def test_setdefaultencoding_removed(self):
|
|
|
|
# Make sure sys.setdefaultencoding is gone
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(not hasattr(sys, "setdefaultencoding"))
|
2004-06-04 22:12:51 -03:00
|
|
|
|
|
|
|
def test_sitecustomize_executed(self):
|
|
|
|
# If sitecustomize is available, it should have been imported.
|
2006-08-18 19:13:04 -03:00
|
|
|
if "sitecustomize" not in sys.modules:
|
2004-06-04 22:12:51 -03:00
|
|
|
try:
|
|
|
|
import sitecustomize
|
|
|
|
except ImportError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("sitecustomize not imported automatically")
|
|
|
|
|
|
|
|
def test_main():
|
|
|
|
run_unittest(HelperFunctionsTests, ImportSideEffectTests)
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
test_main()
|