| 
									
										
										
										
											2009-06-01 22:36:26 +00:00
										 |  |  | # -*- coding: utf8 -*- | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  | """Tests for distutils.dist.""" | 
					
						
							|  |  |  | import os | 
					
						
							| 
									
										
										
										
											2007-08-09 01:03:29 +00:00
										 |  |  | import io | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  | import sys | 
					
						
							|  |  |  | import unittest | 
					
						
							| 
									
										
										
										
											2008-12-29 22:38:38 +00:00
										 |  |  | import warnings | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  | from distutils.dist import Distribution, fix_help_options | 
					
						
							|  |  |  | from distutils.cmd import Command | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | from test.support import TESTFN, captured_stdout | 
					
						
							| 
									
										
										
										
											2009-02-14 14:35:51 +00:00
										 |  |  | from distutils.tests import support | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  | class test_dist(Command): | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  |     """Sample distutils extension command.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     user_options = [ | 
					
						
							|  |  |  |         ("sample-option=", "S", "help text"), | 
					
						
							|  |  |  |         ] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def initialize_options(self): | 
					
						
							|  |  |  |         self.sample_option = None | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  | class TestDistribution(Distribution): | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  |     """Distribution subclasses that avoids the default search for
 | 
					
						
							|  |  |  |     configuration files. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     The ._config_files attribute must be set before | 
					
						
							|  |  |  |     .parse_config_files() is called. | 
					
						
							|  |  |  |     """
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def find_config_files(self): | 
					
						
							|  |  |  |         return self._config_files | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-01 22:36:26 +00:00
										 |  |  | class DistributionTestCase(support.LoggingSilencer, | 
					
						
							|  |  |  |                            unittest.TestCase): | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def setUp(self): | 
					
						
							| 
									
										
										
										
											2009-05-10 12:20:44 +00:00
										 |  |  |         super(DistributionTestCase, self).setUp() | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  |         self.argv = sys.argv[:] | 
					
						
							|  |  |  |         del sys.argv[1:] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def tearDown(self): | 
					
						
							|  |  |  |         sys.argv[:] = self.argv | 
					
						
							| 
									
										
										
										
											2009-05-10 12:20:44 +00:00
										 |  |  |         super(DistributionTestCase, self).tearDown() | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def create_distribution(self, configfiles=()): | 
					
						
							|  |  |  |         d = TestDistribution() | 
					
						
							|  |  |  |         d._config_files = configfiles | 
					
						
							|  |  |  |         d.parse_config_files() | 
					
						
							|  |  |  |         d.parse_command_line() | 
					
						
							|  |  |  |         return d | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_command_packages_unspecified(self): | 
					
						
							|  |  |  |         sys.argv.append("build") | 
					
						
							|  |  |  |         d = self.create_distribution() | 
					
						
							|  |  |  |         self.assertEqual(d.get_command_packages(), ["distutils.command"]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_command_packages_cmdline(self): | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  |         from distutils.tests.test_dist import test_dist | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  |         sys.argv.extend(["--command-packages", | 
					
						
							|  |  |  |                          "foo.bar,distutils.tests", | 
					
						
							|  |  |  |                          "test_dist", | 
					
						
							|  |  |  |                          "-Ssometext", | 
					
						
							|  |  |  |                          ]) | 
					
						
							|  |  |  |         d = self.create_distribution() | 
					
						
							|  |  |  |         # let's actually try to load our test command: | 
					
						
							|  |  |  |         self.assertEqual(d.get_command_packages(), | 
					
						
							|  |  |  |                          ["distutils.command", "foo.bar", "distutils.tests"]) | 
					
						
							|  |  |  |         cmd = d.get_command_obj("test_dist") | 
					
						
							| 
									
										
										
										
											2009-08-13 08:51:18 +00:00
										 |  |  |         self.assertTrue(isinstance(cmd, test_dist)) | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  |         self.assertEqual(cmd.sample_option, "sometext") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_command_packages_configfile(self): | 
					
						
							|  |  |  |         sys.argv.append("build") | 
					
						
							|  |  |  |         f = open(TESTFN, "w") | 
					
						
							|  |  |  |         try: | 
					
						
							| 
									
										
										
										
											2007-02-09 05:37:30 +00:00
										 |  |  |             print("[global]", file=f) | 
					
						
							|  |  |  |             print("command_packages = foo.bar, splat", file=f) | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  |             f.close() | 
					
						
							|  |  |  |             d = self.create_distribution([TESTFN]) | 
					
						
							|  |  |  |             self.assertEqual(d.get_command_packages(), | 
					
						
							|  |  |  |                              ["distutils.command", "foo.bar", "splat"]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             # ensure command line overrides config: | 
					
						
							|  |  |  |             sys.argv[1:] = ["--command-packages", "spork", "build"] | 
					
						
							|  |  |  |             d = self.create_distribution([TESTFN]) | 
					
						
							|  |  |  |             self.assertEqual(d.get_command_packages(), | 
					
						
							|  |  |  |                              ["distutils.command", "spork"]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             # Setting --command-packages to '' should cause the default to | 
					
						
							|  |  |  |             # be used even if a config file specified something else: | 
					
						
							|  |  |  |             sys.argv[1:] = ["--command-packages", "", "build"] | 
					
						
							|  |  |  |             d = self.create_distribution([TESTFN]) | 
					
						
							|  |  |  |             self.assertEqual(d.get_command_packages(), ["distutils.command"]) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             os.unlink(TESTFN) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-12-29 22:38:38 +00:00
										 |  |  |     def test_empty_options(self): | 
					
						
							|  |  |  |         # an empty options dictionary should not stay in the | 
					
						
							|  |  |  |         # list of attributes | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |         klass = Distribution | 
					
						
							| 
									
										
										
										
											2008-12-29 22:38:38 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         # catching warnings | 
					
						
							|  |  |  |         warns = [] | 
					
						
							|  |  |  |         def _warn(msg): | 
					
						
							|  |  |  |             warns.append(msg) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         old_warn = warnings.warn | 
					
						
							|  |  |  |         warnings.warn = _warn | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             dist = klass(attrs={'author': 'xxx', | 
					
						
							|  |  |  |                                 'name': 'xxx', | 
					
						
							|  |  |  |                                 'version': 'xxx', | 
					
						
							|  |  |  |                                 'url': 'xxxx', | 
					
						
							|  |  |  |                                 'options': {}}) | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             warnings.warn = old_warn | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertEquals(len(warns), 0) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-06-01 22:36:26 +00:00
										 |  |  |     def test_finalize_options(self): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         attrs = {'keywords': 'one,two', | 
					
						
							|  |  |  |                  'platforms': 'one,two'} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         dist = Distribution(attrs=attrs) | 
					
						
							|  |  |  |         dist.finalize_options() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # finalize_option splits platforms and keywords | 
					
						
							|  |  |  |         self.assertEquals(dist.metadata.platforms, ['one', 'two']) | 
					
						
							|  |  |  |         self.assertEquals(dist.metadata.keywords, ['one', 'two']) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_get_command_packages(self): | 
					
						
							|  |  |  |         dist = Distribution() | 
					
						
							|  |  |  |         self.assertEquals(dist.command_packages, None) | 
					
						
							|  |  |  |         cmds = dist.get_command_packages() | 
					
						
							|  |  |  |         self.assertEquals(cmds, ['distutils.command']) | 
					
						
							|  |  |  |         self.assertEquals(dist.command_packages, | 
					
						
							|  |  |  |                           ['distutils.command']) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         dist.command_packages = 'one,two' | 
					
						
							|  |  |  |         cmds = dist.get_command_packages() | 
					
						
							|  |  |  |         self.assertEquals(cmds, ['distutils.command', 'one', 'two']) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-10 12:20:44 +00:00
										 |  |  | class MetadataTestCase(support.TempdirManager, support.EnvironGuard, | 
					
						
							|  |  |  |                        unittest.TestCase): | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_simple_metadata(self): | 
					
						
							|  |  |  |         attrs = {"name": "package", | 
					
						
							|  |  |  |                  "version": "1.0"} | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |         dist = Distribution(attrs) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |         meta = self.format_metadata(dist) | 
					
						
							| 
									
										
										
										
											2009-08-13 08:51:18 +00:00
										 |  |  |         self.assertTrue("Metadata-Version: 1.0" in meta) | 
					
						
							|  |  |  |         self.assertTrue("provides:" not in meta.lower()) | 
					
						
							|  |  |  |         self.assertTrue("requires:" not in meta.lower()) | 
					
						
							|  |  |  |         self.assertTrue("obsoletes:" not in meta.lower()) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_provides(self): | 
					
						
							|  |  |  |         attrs = {"name": "package", | 
					
						
							|  |  |  |                  "version": "1.0", | 
					
						
							|  |  |  |                  "provides": ["package", "package.sub"]} | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |         dist = Distribution(attrs) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |         self.assertEqual(dist.metadata.get_provides(), | 
					
						
							|  |  |  |                          ["package", "package.sub"]) | 
					
						
							|  |  |  |         self.assertEqual(dist.get_provides(), | 
					
						
							|  |  |  |                          ["package", "package.sub"]) | 
					
						
							|  |  |  |         meta = self.format_metadata(dist) | 
					
						
							| 
									
										
										
										
											2009-08-13 08:51:18 +00:00
										 |  |  |         self.assertTrue("Metadata-Version: 1.1" in meta) | 
					
						
							|  |  |  |         self.assertTrue("requires:" not in meta.lower()) | 
					
						
							|  |  |  |         self.assertTrue("obsoletes:" not in meta.lower()) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_provides_illegal(self): | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |         self.assertRaises(ValueError, Distribution, | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |                           {"name": "package", | 
					
						
							|  |  |  |                            "version": "1.0", | 
					
						
							|  |  |  |                            "provides": ["my.pkg (splat)"]}) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_requires(self): | 
					
						
							|  |  |  |         attrs = {"name": "package", | 
					
						
							|  |  |  |                  "version": "1.0", | 
					
						
							|  |  |  |                  "requires": ["other", "another (==1.0)"]} | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |         dist = Distribution(attrs) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |         self.assertEqual(dist.metadata.get_requires(), | 
					
						
							|  |  |  |                          ["other", "another (==1.0)"]) | 
					
						
							|  |  |  |         self.assertEqual(dist.get_requires(), | 
					
						
							|  |  |  |                          ["other", "another (==1.0)"]) | 
					
						
							|  |  |  |         meta = self.format_metadata(dist) | 
					
						
							| 
									
										
										
										
											2009-08-13 08:51:18 +00:00
										 |  |  |         self.assertTrue("Metadata-Version: 1.1" in meta) | 
					
						
							|  |  |  |         self.assertTrue("provides:" not in meta.lower()) | 
					
						
							|  |  |  |         self.assertTrue("Requires: other" in meta) | 
					
						
							|  |  |  |         self.assertTrue("Requires: another (==1.0)" in meta) | 
					
						
							|  |  |  |         self.assertTrue("obsoletes:" not in meta.lower()) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_requires_illegal(self): | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |         self.assertRaises(ValueError, Distribution, | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |                           {"name": "package", | 
					
						
							|  |  |  |                            "version": "1.0", | 
					
						
							|  |  |  |                            "requires": ["my.pkg (splat)"]}) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_obsoletes(self): | 
					
						
							|  |  |  |         attrs = {"name": "package", | 
					
						
							|  |  |  |                  "version": "1.0", | 
					
						
							|  |  |  |                  "obsoletes": ["other", "another (<1.0)"]} | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |         dist = Distribution(attrs) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |         self.assertEqual(dist.metadata.get_obsoletes(), | 
					
						
							|  |  |  |                          ["other", "another (<1.0)"]) | 
					
						
							|  |  |  |         self.assertEqual(dist.get_obsoletes(), | 
					
						
							|  |  |  |                          ["other", "another (<1.0)"]) | 
					
						
							|  |  |  |         meta = self.format_metadata(dist) | 
					
						
							| 
									
										
										
										
											2009-08-13 08:51:18 +00:00
										 |  |  |         self.assertTrue("Metadata-Version: 1.1" in meta) | 
					
						
							|  |  |  |         self.assertTrue("provides:" not in meta.lower()) | 
					
						
							|  |  |  |         self.assertTrue("requires:" not in meta.lower()) | 
					
						
							|  |  |  |         self.assertTrue("Obsoletes: other" in meta) | 
					
						
							|  |  |  |         self.assertTrue("Obsoletes: another (<1.0)" in meta) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_obsoletes_illegal(self): | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |         self.assertRaises(ValueError, Distribution, | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |                           {"name": "package", | 
					
						
							|  |  |  |                            "version": "1.0", | 
					
						
							|  |  |  |                            "obsoletes": ["my.pkg (splat)"]}) | 
					
						
							| 
									
										
										
										
											2005-03-28 01:08:02 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |     def format_metadata(self, dist): | 
					
						
							| 
									
										
										
										
											2007-08-09 01:03:29 +00:00
										 |  |  |         sio = io.StringIO() | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |         dist.metadata.write_pkg_file(sio) | 
					
						
							|  |  |  |         return sio.getvalue() | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  |     def test_custom_pydistutils(self): | 
					
						
							|  |  |  |         # fixes #2166 | 
					
						
							|  |  |  |         # make sure pydistutils.cfg is found | 
					
						
							|  |  |  |         if os.name == 'posix': | 
					
						
							|  |  |  |             user_filename = ".pydistutils.cfg" | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             user_filename = "pydistutils.cfg" | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-02-14 14:35:51 +00:00
										 |  |  |         temp_dir = self.mkdtemp() | 
					
						
							|  |  |  |         user_filename = os.path.join(temp_dir, user_filename) | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  |         f = open(user_filename, 'w') | 
					
						
							|  |  |  |         f.write('.') | 
					
						
							|  |  |  |         f.close() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         try: | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |             dist = Distribution() | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |             # linux-style | 
					
						
							|  |  |  |             if sys.platform in ('linux', 'darwin'): | 
					
						
							| 
									
										
										
										
											2009-05-10 12:20:44 +00:00
										 |  |  |                 self.environ['HOME'] = temp_dir | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  |                 files = dist.find_config_files() | 
					
						
							| 
									
										
										
										
											2009-08-13 08:51:18 +00:00
										 |  |  |                 self.assertTrue(user_filename in files) | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |             # win32-style | 
					
						
							|  |  |  |             if sys.platform == 'win32': | 
					
						
							|  |  |  |                 # home drive should be found | 
					
						
							| 
									
										
										
										
											2009-05-10 12:20:44 +00:00
										 |  |  |                 self.environ['HOME'] = temp_dir | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  |                 files = dist.find_config_files() | 
					
						
							| 
									
										
										
										
											2009-08-13 08:51:18 +00:00
										 |  |  |                 self.assertTrue(user_filename in files, | 
					
						
							| 
									
										
											  
											
												Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines
  #2709 followup: better description of Tk's pros and cons.
........
  r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines
  #1326: document and test zipimporter.archive and zipimporter.prefix.
........
  r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2816: clarify error messages for EOF while scanning strings.
........
  r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines
  #2787: Flush stdout after writing test name, helpful when running
  hanging or long-running tests. Patch by Adam Olsen.
........
  r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines
  #2803: fix wrong invocation of heappush in seldom-reached code.
  Thanks to Matt Harden.
........
  r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines
  broaden .bzrignore
........
  r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line
  Add message to test assertion
........
  r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line
  Try setting HOME env.var to fix test on Win32
........
  r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines
  #2809 followup: even better split docstring.
........
  r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines
  - #2250: Exceptions raised during evaluation of names in rlcompleter's
    ``Completer.complete()`` method are now caught and ignored.
........
  r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines
  Clarify os.strerror()s exception behavior.
........
  r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines
  #2535: remove duplicated method.
........
  r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines
  Moved the Queue module stub in lib-old.
........
											
										 
											2008-05-16 00:41:41 +00:00
										 |  |  |                              '%r not found in %r' % (user_filename, files)) | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  |         finally: | 
					
						
							|  |  |  |             os.remove(user_filename) | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  |     def test_fix_help_options(self): | 
					
						
							|  |  |  |         help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)] | 
					
						
							|  |  |  |         fancy_options = fix_help_options(help_tuples) | 
					
						
							|  |  |  |         self.assertEquals(fancy_options[0], ('a', 'b', 'c')) | 
					
						
							|  |  |  |         self.assertEquals(fancy_options[1], (1, 2, 3)) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_show_help(self): | 
					
						
							|  |  |  |         # smoke test, just makes sure some help is displayed | 
					
						
							|  |  |  |         dist = Distribution() | 
					
						
							|  |  |  |         old_argv = sys.argv | 
					
						
							|  |  |  |         sys.argv = [] | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             dist.help = 1 | 
					
						
							|  |  |  |             dist.script_name = 'setup.py' | 
					
						
							|  |  |  |             with captured_stdout() as s: | 
					
						
							|  |  |  |                 dist.parse_command_line() | 
					
						
							|  |  |  |         finally: | 
					
						
							|  |  |  |             sys.argv = old_argv | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         output = [line for line in s.getvalue().split('\n') | 
					
						
							|  |  |  |                   if line.strip() != ''] | 
					
						
							| 
									
										
										
										
											2009-08-13 08:51:18 +00:00
										 |  |  |         self.assertTrue(len(output) > 0) | 
					
						
							| 
									
										
										
										
											2009-05-17 10:50:24 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-08-03 16:37:40 +00:00
										 |  |  | def test_suite(): | 
					
						
							| 
									
										
										
										
											2005-03-20 22:19:47 +00:00
										 |  |  |     suite = unittest.TestSuite() | 
					
						
							|  |  |  |     suite.addTest(unittest.makeSuite(DistributionTestCase)) | 
					
						
							|  |  |  |     suite.addTest(unittest.makeSuite(MetadataTestCase)) | 
					
						
							|  |  |  |     return suite | 
					
						
							| 
									
										
											  
											
												Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines
  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.
  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines
  Cleaned up io._BytesIO.write().
  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines
  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line
  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines
  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines
  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines
  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines
  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines
  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines
  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines
  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines
  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines
  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines
  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines
  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines
  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines
  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines
  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines
  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines
  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line
  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines
  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines
  Add some sentence endings.
........
											
										 
											2008-05-16 00:03:33 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | if __name__ == "__main__": | 
					
						
							|  |  |  |     unittest.main(defaultTest="test_suite") |