mirror of
				https://github.com/python/cpython.git
				synced 2025-10-30 21:21:22 +00:00 
			
		
		
		
	Deprecate the pure module for 3.0.
This commit is contained in:
		
							parent
							
								
									1aed624f7c
								
							
						
					
					
						commit
						9ac3974de8
					
				
					 3 changed files with 16 additions and 1 deletions
				
			
		|  | @ -129,8 +129,9 @@ class TestStdlibRemovals(unittest.TestCase): | ||||||
|     # test.testall not tested as it executes all unit tests as an |     # test.testall not tested as it executes all unit tests as an | ||||||
|     # import side-effect. |     # import side-effect. | ||||||
|     all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new') |     all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new') | ||||||
|  |     inclusive_platforms = {'irix':('pure',)} | ||||||
| 
 | 
 | ||||||
|     def check_removal(self, module_name): |     def check_removal(self, module_name, optional=False): | ||||||
|         """Make sure the specified module, when imported, raises a |         """Make sure the specified module, when imported, raises a | ||||||
|         DeprecationWarning and specifies itself in the message.""" |         DeprecationWarning and specifies itself in the message.""" | ||||||
|         original_module = None |         original_module = None | ||||||
|  | @ -145,6 +146,9 @@ def check_removal(self, module_name): | ||||||
|                     __import__(module_name, level=0) |                     __import__(module_name, level=0) | ||||||
|                 except DeprecationWarning as exc: |                 except DeprecationWarning as exc: | ||||||
|                     self.assert_(module_name in exc.args[0]) |                     self.assert_(module_name in exc.args[0]) | ||||||
|  |                 except ImportError: | ||||||
|  |                     if not optional: | ||||||
|  |                         raise | ||||||
|                 else: |                 else: | ||||||
|                     self.fail("DeprecationWarning not raised for %s" % |                     self.fail("DeprecationWarning not raised for %s" % | ||||||
|                                 module_name) |                                 module_name) | ||||||
|  | @ -159,6 +163,11 @@ def test_platform_independent_removals(self): | ||||||
|         for module_name in self.all_platforms: |         for module_name in self.all_platforms: | ||||||
|             self.check_removal(module_name) |             self.check_removal(module_name) | ||||||
| 
 | 
 | ||||||
|  |     def test_platform_specific_removals(self): | ||||||
|  |         # Test the removal of platform-specific modules. | ||||||
|  |         for module_name in self.inclusive_platforms.get(sys.platform, []): | ||||||
|  |             self.check_removal(module_name, optional=True) | ||||||
|  | 
 | ||||||
|     def test_os_path_walk(self): |     def test_os_path_walk(self): | ||||||
|         msg = "In 3.x, os.path.walk is removed in favor of os.walk." |         msg = "In 3.x, os.path.walk is removed in favor of os.walk." | ||||||
|         def dumbo(where, names, args): pass |         def dumbo(where, names, args): pass | ||||||
|  |  | ||||||
|  | @ -23,6 +23,8 @@ Extension Modules | ||||||
| Library | Library | ||||||
| ------- | ------- | ||||||
| 
 | 
 | ||||||
|  | - The pure module has been deprecated for removal in Python 3.0. | ||||||
|  | 
 | ||||||
| - Issue #2487: change the semantics of math.ldexp(x, n) when n is too | - Issue #2487: change the semantics of math.ldexp(x, n) when n is too | ||||||
|   large to fit in a C long.  ldexp(x, n) now returns a zero (with |   large to fit in a C long.  ldexp(x, n) now returns a zero (with | ||||||
|   suitable sign) if n is large and negative; previously, it raised |   suitable sign) if n is large and negative; previously, it raised | ||||||
|  |  | ||||||
|  | @ -951,6 +951,10 @@ initpure() | ||||||
| { | { | ||||||
| 	PyObject *m, *d; | 	PyObject *m, *d; | ||||||
| 
 | 
 | ||||||
|  | 	if (PyErr_WarnPy3k("the pure module has been removed in " | ||||||
|  | 	                   "Python 3.0", 2) < 0) | ||||||
|  | 	    return;	 | ||||||
|  | 
 | ||||||
| 	m = Py_InitModule("pure", pure_methods); | 	m = Py_InitModule("pure", pure_methods); | ||||||
| 	if (m == NULL) | 	if (m == NULL) | ||||||
|     		return; |     		return; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brett Cannon
						Brett Cannon