summaryrefslogtreecommitdiffstats
path: root/Lib/fnmatch.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2009-11-01 20:36:24 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2009-11-01 20:36:24 (GMT)
commit6c4a725a37611fa60efe36f7e85ba8fbeab6dd15 (patch)
tree468771bfaf287cdf2b62edf6ece9a902cba59b3d /Lib/fnmatch.py
parentfc1c75d93f1fa1b911542afec46edd31506ff47c (diff)
downloadcpython-6c4a725a37611fa60efe36f7e85ba8fbeab6dd15.zip
cpython-6c4a725a37611fa60efe36f7e85ba8fbeab6dd15.tar.gz
cpython-6c4a725a37611fa60efe36f7e85ba8fbeab6dd15.tar.bz2
Merged revisions 74476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r74476 | gregory.p.smith | 2009-08-16 11:58:46 -0700 (Sun, 16 Aug 2009) | 9 lines Merged revisions 74475 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74475 | gregory.p.smith | 2009-08-16 11:52:58 -0700 (Sun, 16 Aug 2009) | 2 lines Issue 6665: Fix fnmatch to properly match filenames with newlines in them. ........ ................
Diffstat (limited to 'Lib/fnmatch.py')
-rw-r--r--Lib/fnmatch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/fnmatch.py b/Lib/fnmatch.py
index 0397549..30c0a92 100644
--- a/Lib/fnmatch.py
+++ b/Lib/fnmatch.py
@@ -113,4 +113,4 @@ def translate(pat):
res = '%s[%s]' % (res, stuff)
else:
res = res + re.escape(c)
- return res + "$"
+ return res + '\Z(?ms)'