Pass flags programmatically, avoiding deprecating trailing pattern flags syntax revealed in #1015.

2 files changed, 15 insertions, 14 deletions

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1a6ea9cb..151e495b 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -112,7 +112,8 @@ def translate_pattern(glob):
         if not last_chunk:
             pat += sep
 
-    return re.compile(pat + r'\Z(?ms)')
+    pat += r'\Z'
+    return re.compile(pat, flags=re.MULTILINE|re.DOTALL)
 
 
 class egg_info(Command):
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 3b34c888..57347b53 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -71,26 +71,26 @@ def get_pattern(glob):
 
 def test_translated_pattern_test():
     l = make_local_path
-    assert get_pattern('foo') == r'foo\Z(?ms)'
-    assert get_pattern(l('foo/bar')) == l(r'foo\/bar\Z(?ms)')
+    assert get_pattern('foo') == r'foo\Z'
+    assert get_pattern(l('foo/bar')) == l(r'foo\/bar\Z')
 
     # Glob matching
-    assert get_pattern('*.txt') == l(r'[^\/]*\.txt\Z(?ms)')
-    assert get_pattern('dir/*.txt') == l(r'dir\/[^\/]*\.txt\Z(?ms)')
-    assert get_pattern('*/*.py') == l(r'[^\/]*\/[^\/]*\.py\Z(?ms)')
+    assert get_pattern('*.txt') == l(r'[^\/]*\.txt\Z')
+    assert get_pattern('dir/*.txt') == l(r'dir\/[^\/]*\.txt\Z')
+    assert get_pattern('*/*.py') == l(r'[^\/]*\/[^\/]*\.py\Z')
     assert get_pattern('docs/page-?.txt') \
-        == l(r'docs\/page\-[^\/]\.txt\Z(?ms)')
+        == l(r'docs\/page\-[^\/]\.txt\Z')
 
     # Globstars change what they mean depending upon where they are
-    assert get_pattern(l('foo/**/bar')) == l(r'foo\/(?:[^\/]+\/)*bar\Z(?ms)')
-    assert get_pattern(l('foo/**')) == l(r'foo\/.*\Z(?ms)')
-    assert get_pattern(l('**')) == r'.*\Z(?ms)'
+    assert get_pattern(l('foo/**/bar')) == l(r'foo\/(?:[^\/]+\/)*bar\Z')
+    assert get_pattern(l('foo/**')) == l(r'foo\/.*\Z')
+    assert get_pattern(l('**')) == r'.*\Z'
 
     # Character classes
-    assert get_pattern('pre[one]post') == r'pre[one]post\Z(?ms)'
-    assert get_pattern('hello[!one]world') == r'hello[^one]world\Z(?ms)'
-    assert get_pattern('[]one].txt') == r'[\]one]\.txt\Z(?ms)'
-    assert get_pattern('foo[!]one]bar') == r'foo[^\]one]bar\Z(?ms)'
+    assert get_pattern('pre[one]post') == r'pre[one]post\Z'
+    assert get_pattern('hello[!one]world') == r'hello[^one]world\Z'
+    assert get_pattern('[]one].txt') == r'[\]one]\.txt\Z'
+    assert get_pattern('foo[!]one]bar') == r'foo[^\]one]bar\Z'
 
 
 class TempDirTestCase(object):