summaryrefslogtreecommitdiffstats
path: root/Lib/fnmatch.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2009-08-16 18:58:46 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2009-08-16 18:58:46 (GMT)
commit01099707dbc1b7c774253ac0cd278c2c09272a30 (patch)
tree19e5b666477130835e22321a2c88dcbe3dc1d269 /Lib/fnmatch.py
parentc3b2ae4adb31d2495951472b688149c7f19bbd63 (diff)
downloadcpython-01099707dbc1b7c774253ac0cd278c2c09272a30.zip
cpython-01099707dbc1b7c774253ac0cd278c2c09272a30.tar.gz
cpython-01099707dbc1b7c774253ac0cd278c2c09272a30.tar.bz2
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)'