Move locale out of fixtures and into localeapp to prevent test runner weirdness (finding nonminimal.txt.py).

10 files changed, 10 insertions, 10 deletions

diff --git a/repoze/bfg/tests/fixtures/__init__.py b/repoze/bfg/tests/localeapp/__init__.py
index 1a35cdb4a..1a35cdb4a 100644
--- a/repoze/bfg/tests/fixtures/__init__.py
+++ b/repoze/bfg/tests/localeapp/__init__.py
diff --git a/repoze/bfg/tests/fixtures/locale/GARBAGE b/repoze/bfg/tests/localeapp/locale/GARBAGE
index 032c55584..032c55584 100644
--- a/repoze/bfg/tests/fixtures/locale/GARBAGE
+++ b/repoze/bfg/tests/localeapp/locale/GARBAGE
diff --git a/repoze/bfg/tests/fixtures/locale/be/LC_MESSAGES b/repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES
index 909cf6a3b..909cf6a3b 100644
--- a/repoze/bfg/tests/fixtures/locale/be/LC_MESSAGES
+++ b/repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES
diff --git a/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.mo b/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.mo
+++ b/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo
diff --git a/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.po b/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.po
+++ b/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po
diff --git a/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.mo b/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.mo
+++ b/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo
diff --git a/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.po b/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.po
+++ b/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po
diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py
index a1e753179..90e074e9a 100644
--- a/repoze/bfg/tests/test_configuration.py
+++ b/repoze/bfg/tests/test_configuration.py
@@ -1825,9 +1825,9 @@ class ConfiguratorTests(unittest.TestCase):
         import os
         from repoze.bfg.interfaces import ITranslationDirectories
         config = self._makeOne()
-        config.add_translation_dirs('repoze.bfg.tests.fixtures:locale')
+        config.add_translation_dirs('repoze.bfg.tests.localeapp:locale')
         here = os.path.dirname(__file__)
-        locale = os.path.join(here, 'fixtures', 'locale')
+        locale = os.path.join(here, 'localeapp', 'locale')
         self.assertEqual(config.registry.getUtility(ITranslationDirectories),
                          [locale])
 
@@ -1838,7 +1838,7 @@ class ConfiguratorTests(unittest.TestCase):
         config = self._makeOne()
         manager.push({'request':request, 'registry':config.registry})
         try:
-            config.add_translation_dirs('repoze.bfg.tests.fixtures:locale')
+            config.add_translation_dirs('repoze.bfg.tests.localeapp:locale')
             translate = config.registry.getUtility(IChameleonTranslate)
             self.assertEqual(translate('Approve'), u'Approve')
         finally:
@@ -1849,7 +1849,7 @@ class ConfiguratorTests(unittest.TestCase):
         from repoze.bfg.interfaces import ITranslationDirectories
         config = self._makeOne()
         here = os.path.dirname(__file__)
-        locale = os.path.join(here, 'fixtures', 'locale')
+        locale = os.path.join(here, 'localeapp', 'locale')
         config.add_translation_dirs(locale)
         self.assertEqual(config.registry.getUtility(ITranslationDirectories),
                          [locale])
diff --git a/repoze/bfg/tests/test_i18n.py b/repoze/bfg/tests/test_i18n.py
index 9c4b226e4..fb79a802c 100644
--- a/repoze/bfg/tests/test_i18n.py
+++ b/repoze/bfg/tests/test_i18n.py
@@ -179,7 +179,7 @@ class Test_get_localizer(unittest.TestCase):
         from repoze.bfg.i18n import Localizer
         registry = get_current_registry()
         here = os.path.dirname(__file__)
-        localedir = os.path.join(here, 'fixtures', 'locale')
+        localedir = os.path.join(here, 'localeapp', 'locale')
         localedirs = [localedir]
         registry.registerUtility(localedirs, ITranslationDirectories)
         request = DummyRequest()
@@ -198,7 +198,7 @@ class Test_get_localizer(unittest.TestCase):
         from repoze.bfg.i18n import Localizer
         registry = get_current_registry()
         here = os.path.dirname(__file__)
-        localedir = os.path.join(here, 'fixtures', 'locale')
+        localedir = os.path.join(here, 'localeapp', 'locale')
         localedirs = [localedir]
         registry.registerUtility(localedirs, ITranslationDirectories)
         request = DummyRequest()
@@ -270,7 +270,7 @@ class TestTranslations(unittest.TestCase):
         import gettext
         import os
         here = os.path.dirname(__file__)
-        localedir = os.path.join(here, 'fixtures', 'locale')
+        localedir = os.path.join(here, 'localeapp', 'locale')
         locales = ['de', 'en']
         klass = self._getTargetClass()
         result = klass.load(localedir, locales, domain=None)
@@ -279,7 +279,7 @@ class TestTranslations(unittest.TestCase):
     def test_load_found_locale_and_domain(self):
         import os
         here = os.path.dirname(__file__)
-        localedir = os.path.join(here, 'fixtures', 'locale')
+        localedir = os.path.join(here, 'localeapp', 'locale')
         locales = ['de', 'en']
         klass = self._getTargetClass()
         result = klass.load(localedir, locales, domain='deformsite')
@@ -288,7 +288,7 @@ class TestTranslations(unittest.TestCase):
     def test_load_found_locale_and_domain_locale_is_string(self):
         import os
         here = os.path.dirname(__file__)
-        localedir = os.path.join(here, 'fixtures', 'locale')
+        localedir = os.path.join(here, 'localeapp', 'locale')
         locales = 'de'
         klass = self._getTargetClass()
         result = klass.load(localedir, locales, domain='deformsite')
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 5fdf25f33..0c8cccb06 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -1055,7 +1055,7 @@ class TestTranslationDirDirective(unittest.TestCase):
     def test_it(self):
         from repoze.bfg.configuration import Configurator
         context = DummyContext()
-        tdir = 'repoze.bfg.tests.fixtures:locale'
+        tdir = 'repoze.bfg.tests.localeapp:locale'
         self._callFUT(context, tdir)
         actions = context.actions
         self.assertEqual(len(actions), 1)