mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 13:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Deprecate the dircache module for 3.0.

Browse source
This commit is contained in:
Brett Cannon 2008-05-10 21:12:57 +00:00
parent 10f5db6424
commit 0aa6e1b8fb
5 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Doc/library/dircache.rst
View file

@ -4,6 +4,12 @@
.. module:: dircache .. module:: dircache
:synopsis: Return directory listing, with cache mechanism. :synopsis: Return directory listing, with cache mechanism.
:deprecated:
.. deprecated:: 2.6
The dircache module has been removed in Python 3.0.
.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il> .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>

3
Lib/dircache.py
View file

@ -3,6 +3,9 @@
The listdir() routine returns a sorted list of the files in a directory, The listdir() routine returns a sorted list of the files in a directory,
using a cache to avoid reading the directory more often than necessary. using a cache to avoid reading the directory more often than necessary.
The annotate() routine appends slashes to directories.""" The annotate() routine appends slashes to directories."""
from warnings import warnpy3k
warnpy3k("the dircache module has been removed in Python 3.0", stacklevel=2)
del warnpy3k
import os import os

3
Lib/test/regrtest.py
View file

@ -678,7 +678,8 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
def dash_R_cleanup(fs, ps, pic, abcs): def dash_R_cleanup(fs, ps, pic, abcs):
import gc, copy_reg import gc, copy_reg
import _strptime, linecache, dircache import _strptime, linecache
dircache = test_support.import_module('dircache', deprecated=True)
import urlparse, urllib, urllib2, mimetypes, doctest import urlparse, urllib, urllib2, mimetypes, doctest
import struct, filecmp import struct, filecmp
from distutils.dir_util import _path_created from distutils.dir_util import _path_created

10
Lib/test/test_dircache.py
View file

@ -4,8 +4,9 @@
""" """
import unittest import unittest
from test.test_support import run_unittest, TESTFN from test.test_support import run_unittest, TESTFN, import_module
import dircache, os, time, sys, tempfile dircache = import_module('dircache', deprecated=True)
import os, time, sys, tempfile
class DircacheTests(unittest.TestCase): class DircacheTests(unittest.TestCase):
@ -66,7 +67,10 @@ class DircacheTests(unittest.TestCase):
def test_main(): def test_main():
run_unittest(DircacheTests) try:
run_unittest(DircacheTests)
finally:
dircache.reset()
if __name__ == "__main__": if __name__ == "__main__":

2
Lib/test/test_py3kwarn.py
View file

@ -129,7 +129,7 @@ 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', 'rexec', all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
'Bastion', 'compiler') 'Bastion', 'compiler', 'dircache')
inclusive_platforms = {'irix':('pure',)} inclusive_platforms = {'irix':('pure',)}
# XXX Don't know if lib-tk is only installed if _tkinter is built. # XXX Don't know if lib-tk is only installed if _tkinter is built.
optional_modules = ('bsddb185', 'Canvas') optional_modules = ('bsddb185', 'Canvas')