Rename the ''CVS'' directory in the test data to ''ignored'', as quite a number of...

diff --git a/babel/messages/tests/data/mapping.cfg b/babel/messages/tests/data/mapping.cfg
index 314c77b156ab60d4253bd4c6a1ce684ebf8e8d70..48c1bb2489b0c1c3a0eaaf7aec4e5ec3998abf65 100644 (file)
--- a/babel/messages/tests/data/mapping.cfg
+++ b/babel/messages/tests/data/mapping.cfg
@@ -1,5 +1,5 @@
-# Ignore CVS Dirs
-[ignore: **/CVS/**.*]
+# Ignore directory
+[ignore: **/ignored/**.*]
 
 # Extraction from Python source files
 [python: **.py]

diff --git a/babel/messages/tests/data/project/CVS/a_test_file.txt b/babel/messages/tests/data/project/ignored/a_test_file.txt
similarity index 100%
rename from babel/messages/tests/data/project/CVS/a_test_file.txt
rename to babel/messages/tests/data/project/ignored/a_test_file.txt

diff --git a/babel/messages/tests/data/project/CVS/an_example.txt b/babel/messages/tests/data/project/ignored/an_example.txt
similarity index 100%
rename from babel/messages/tests/data/project/CVS/an_example.txt
rename to babel/messages/tests/data/project/ignored/an_example.txt

diff --git a/babel/messages/tests/data/project/CVS/this_wont_normally_be_here.py b/babel/messages/tests/data/project/ignored/this_wont_normally_be_here.py
similarity index 100%
rename from babel/messages/tests/data/project/CVS/this_wont_normally_be_here.py
rename to babel/messages/tests/data/project/ignored/this_wont_normally_be_here.py

diff --git a/babel/messages/tests/frontend.py b/babel/messages/tests/frontend.py
index effcde2f145f578aaad39f53c017cb1373dfce5c..374b42e004e9b1ca353a7d51c5998e247fc0958f 100644 (file)
--- a/babel/messages/tests/frontend.py
+++ b/babel/messages/tests/frontend.py
@@ -141,7 +141,7 @@ msgid_plural "foobars"
 msgstr[0] ""
 msgstr[1] ""
 
-#: project/CVS/this_wont_normally_be_here.py:11
+#: project/ignored/this_wont_normally_be_here.py:11
 msgid "FooBar"
 msgid_plural "FooBars"
 msgstr[0] ""
@@ -208,8 +208,8 @@ msgstr[1] ""
     def test_extraction_with_mapping_dict(self):
         self.dist.message_extractors = {
             'project': [
-                ('**/CVS/**.*', 'ignore',   None),
-                ('**.py',       'python',   None),
+                ('**/ignored/**.*', 'ignore',   None),
+                ('**.py',           'python',   None),
             ]
         }
         self.cmd.copyright_holder = 'FooBar, Inc.'
@@ -599,7 +599,7 @@ msgid_plural "foobars"
 msgstr[0] ""
 msgstr[1] ""
 
-#: project/CVS/this_wont_normally_be_here.py:11
+#: project/ignored/this_wont_normally_be_here.py:11
 msgid "FooBar"
 msgid_plural "FooBars"
 msgstr[0] ""