diff -Nru python-oslo.i18n-1.1.0/ChangeLog python-oslo.i18n-1.3.0/ChangeLog
--- python-oslo.i18n-1.1.0/ChangeLog	2014-12-02 10:23:28.000000000 -0500
+++ python-oslo.i18n-1.3.0/ChangeLog	2015-01-08 14:46:33.000000000 -0500
@@ -1,6 +1,20 @@
 CHANGES
 =======
 
+1.3.0
+-----
+
+* Add a fixture to let tests manage the lazy flag
+* Fix the link to the bug tracker in the README
+
+1.2.0
+-----
+
+* Correct the translation domain for loading messages
+* Move out of the oslo namespace package
+* Workflow documentation is now in infra-manual
+* Force code sample to be treated as python
+
 1.1.0
 -----
 
diff -Nru python-oslo.i18n-1.1.0/CONTRIBUTING.rst python-oslo.i18n-1.3.0/CONTRIBUTING.rst
--- python-oslo.i18n-1.1.0/CONTRIBUTING.rst	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/CONTRIBUTING.rst	2015-01-08 14:46:13.000000000 -0500
@@ -1,14 +1,13 @@
 If you would like to contribute to the development of OpenStack,
-you must follow the steps in the "If you're a developer, start here"
-section of this page:
+you must follow the steps in this page:
 
-   http://wiki.openstack.org/HowToContribute
+   http://docs.openstack.org/infra/manual/developers.html
 
 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:
 
-   http://wiki.openstack.org/GerritWorkflow
+   http://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
diff -Nru python-oslo.i18n-1.1.0/debian/changelog python-oslo.i18n-1.3.0/debian/changelog
--- python-oslo.i18n-1.1.0/debian/changelog	2014-12-08 09:02:39.000000000 -0500
+++ python-oslo.i18n-1.3.0/debian/changelog	2015-01-09 09:06:52.000000000 -0500
@@ -1,3 +1,10 @@
+python-oslo.i18n (1.3.0-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+  * debian/control, debian/rules: Transition to python-oslo-i18n.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 09 Jan 2015 08:59:24 -0500
+
 python-oslo.i18n (1.1.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release.
diff -Nru python-oslo.i18n-1.1.0/debian/control python-oslo.i18n-1.3.0/debian/control
--- python-oslo.i18n-1.1.0/debian/control	2014-08-11 11:18:46.000000000 -0400
+++ python-oslo.i18n-1.3.0/debian/control	2015-01-09 09:23:41.000000000 -0500
@@ -32,12 +32,14 @@
                  python-oslo.sphinx,
                  python-oslo.vmware,
                  python3-oslo.config
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-oslo.i18n.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-oslo.i18n.git
 Homepage: http://launchpad.net/oslo
 
-Package: python-oslo.i18n
+Package: python-oslo-i18n
+Breaks: python-oslo.i18n (<< 1.3.0-0ubuntu1)
+Replaces: python-oslo.i18n ( << 1.3.0-0ubuntu1)
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: python-babel (>= 1.3), ${misc:Depends}, ${python:Depends}
@@ -48,7 +50,9 @@
  .
  This package contains the Python 2.x module.
 
-Package: python3-oslo.i18n
+Package: python3-oslo-i18n
+Breaks: python3-oslo.i18n (<< 1.3.0-0ubuntu1)
+Replaces: python3-oslo.i18n ( << 1.3.0-0ubuntu1)
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: python3-babel (>= 1.3), ${misc:Depends}, ${python3:Depends}
@@ -59,7 +63,7 @@
  .
  This package contains the Python 3.x module.
 
-Package: python-oslo.i18n-doc
+Package: python-oslo-i18n-doc
 Section: doc
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
@@ -70,3 +74,25 @@
  library.
  .
   This package contains the documentation.
+
+Package: python-oslo.i18n
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, python-oslo-i18n
+Description: transitional dummy package for python-oslo.i18n
+ This transtional package is safe to remove.
+
+Package: python-oslo.i18n-doc
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, python-oslo-i18n-doc
+Description: transitional dummy package for python3-oslo.i18n
+ This transtional package is safe to remove.
+
+Package: python3-oslo.i18n
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, python3-oslo-i18n
+Description: transitional dummy package for python3-oslo.i18n
+ This transtional package is safe to remove.
+
diff -Nru python-oslo.i18n-1.1.0/debian/python-oslo-i18n-doc.doc-base python-oslo.i18n-1.3.0/debian/python-oslo-i18n-doc.doc-base
--- python-oslo.i18n-1.1.0/debian/python-oslo-i18n-doc.doc-base	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/debian/python-oslo-i18n-doc.doc-base	2014-07-12 11:54:31.000000000 -0400
@@ -0,0 +1,9 @@
+Document: oslo.i18n-doc
+Title: oslo.i18n Documentation
+Author: N/A
+Abstract: Sphinx documentation for oslo.i18n
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-oslo.i18n-doc/html/index.html
+Files: /usr/share/doc/python-oslo.i18n-doc/html/*
diff -Nru python-oslo.i18n-1.1.0/debian/python-oslo.i18n-doc.doc-base python-oslo.i18n-1.3.0/debian/python-oslo.i18n-doc.doc-base
--- python-oslo.i18n-1.1.0/debian/python-oslo.i18n-doc.doc-base	2014-07-12 11:54:31.000000000 -0400
+++ python-oslo.i18n-1.3.0/debian/python-oslo.i18n-doc.doc-base	1969-12-31 19:00:00.000000000 -0500
@@ -1,9 +0,0 @@
-Document: oslo.i18n-doc
-Title: oslo.i18n Documentation
-Author: N/A
-Abstract: Sphinx documentation for oslo.i18n
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-oslo.i18n-doc/html/index.html
-Files: /usr/share/doc/python-oslo.i18n-doc/html/*
diff -Nru python-oslo.i18n-1.1.0/debian/rules python-oslo.i18n-1.3.0/debian/rules
--- python-oslo.i18n-1.1.0/debian/rules	2014-07-24 08:52:27.000000000 -0400
+++ python-oslo.i18n-1.3.0/debian/rules	2015-01-09 09:06:22.000000000 -0500
@@ -14,11 +14,11 @@
 override_dh_install:
 	set -e && for pyvers in $(PYTHONS); do \
 		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/python-oslo.i18n; \
+			--root $(CURDIR)/debian/python-oslo-i18n; \
 	done
 	set -e && for pyvers in $(PYTHON3S); do \
 		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/python3-oslo.i18n; \
+			--root $(CURDIR)/debian/python3-oslo-i18n; \
 	done
 
 override_dh_auto_test:
@@ -31,7 +31,7 @@
 	rm -rf build
 
 override_dh_sphinxdoc:
-	sphinx-build -b html doc/source debian/python-oslo.i18n-doc/usr/share/doc/python-oslo.i18n-doc/html
+	sphinx-build -b html doc/source debian/python-oslo.i18n-doc/usr/share/doc/python-oslo-i18n-doc/html
 	dh_sphinxdoc -O--buildsystem=python_distutils
 
 # Commands not to run
diff -Nru python-oslo.i18n-1.1.0/doc/source/api.rst python-oslo.i18n-1.3.0/doc/source/api.rst
--- python-oslo.i18n-1.1.0/doc/source/api.rst	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/doc/source/api.rst	2015-01-08 14:46:13.000000000 -0500
@@ -2,12 +2,12 @@
  API
 =====
 
-oslo.i18n
+oslo_i18n
 =========
 
-.. automodule:: oslo.i18n
+.. automodule:: oslo_i18n
 
-.. autoclass:: oslo.i18n.TranslatorFactory
+.. autoclass:: oslo_i18n.TranslatorFactory
    :members:
 
 .. seealso::
@@ -15,24 +15,24 @@
    An example of using a :class:`TranslatorFactory` is provided in
    :ref:`integration-module`.
 
-.. autofunction:: oslo.i18n.enable_lazy
+.. autofunction:: oslo_i18n.enable_lazy
 
 .. seealso::
 
    :ref:`lazy-translation`
 
-.. autofunction:: oslo.i18n.translate
+.. autofunction:: oslo_i18n.translate
 
-.. autofunction:: oslo.i18n.get_available_languages
+.. autofunction:: oslo_i18n.get_available_languages
 
-oslo.i18n.log
+oslo_i18n.log
 =============
 
-.. automodule:: oslo.i18n.log
+.. automodule:: oslo_i18n.log
    :members:
 
-oslo.i18n.fixture
+oslo_i18n.fixture
 =================
 
-.. automodule:: oslo.i18n.fixture
+.. automodule:: oslo_i18n.fixture
    :members:
diff -Nru python-oslo.i18n-1.1.0/doc/source/guidelines.rst python-oslo.i18n-1.3.0/doc/source/guidelines.rst
--- python-oslo.i18n-1.1.0/doc/source/guidelines.rst	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/doc/source/guidelines.rst	2015-01-08 14:46:13.000000000 -0500
@@ -4,7 +4,7 @@
 
 Text messages the user sees via exceptions or API calls should be
 translated using
-:py:attr:`TranslatorFactory.primary <oslo.i18n.TranslatorFactory.primary>`, which should
+:py:attr:`TranslatorFactory.primary <oslo_i18n.TranslatorFactory.primary>`, which should
 be installed as ``_()`` in the integration module.
 
 .. seealso::
diff -Nru python-oslo.i18n-1.1.0/doc/source/usage.rst python-oslo.i18n-1.3.0/doc/source/usage.rst
--- python-oslo.i18n-1.1.0/doc/source/usage.rst	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/doc/source/usage.rst	2015-01-08 14:46:13.000000000 -0500
@@ -16,16 +16,16 @@
 
 To use oslo.i18n in a project, you will need to create a small
 integration module to hold an instance of
-:class:`~oslo.i18n.TranslatorFactory` and references to
+:class:`~oslo_i18n.TranslatorFactory` and references to
 the marker functions the factory creates.
 
 ::
 
     # app/i18n.py
 
-    from oslo import i18n
+    import oslo_i18n
 
-    _translators = i18n.TranslatorFactory(domain='myapp')
+    _translators = oslo_i18n.TranslatorFactory(domain='myapp')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary
@@ -43,7 +43,7 @@
 Then, in the rest of your code, use the appropriate marker function
 for each message:
 
-::
+.. code-block:: python
 
     from myapp.i18n import _, _LW
 
@@ -151,14 +151,14 @@
 
 ::
 
-    from oslo import i18n
+    import oslo_i18n
 
-    i18n.enable_lazy()
+    oslo_i18n.enable_lazy()
 
 Translating Messages
 ====================
 
-Use :func:`~oslo.i18n.translate` to translate strings to
+Use :func:`~oslo_i18n.translate` to translate strings to
 a specific locale. :func:`translate` handles delayed translation and
 strings that have already been translated immediately. It should be
 used at the point where the locale to be used is known, which is often
@@ -167,9 +167,9 @@
 
 ::
 
-    from oslo import i18n
+    import oslo_i18n
 
-    trans_msg = i18n.translate(msg, desired_locale=my_locale)
+    trans_msg = oslo_i18n.translate(msg, desired_locale=my_locale)
 
 if desired_locale is not specified then the default locale is used.
 
@@ -178,14 +178,14 @@
 
 Only the languages that have translations provided are available for
 translation. To determine which languages are available the
-:func:`~oslo.i18n.get_available_languages` is provided. Since different languages
+:func:`~oslo_i18n.get_available_languages` is provided. Since different languages
 can be installed for each domain, the domain must be specified.
 
 ::
 
-    from oslo import i18n
+    import oslo_i18n
 
-    avail_lang = i18n.get_available_languages('myapp')
+    avail_lang = oslo_i18n.get_available_languages('myapp')
 
 .. seealso::
 
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/_factory.py python-oslo.i18n-1.3.0/oslo/i18n/_factory.py
--- python-oslo.i18n-1.1.0/oslo/i18n/_factory.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/_factory.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,110 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-"""Translation function factory
-"""
-
-import gettext
-import os
-
-import six
-
-from oslo.i18n import _lazy
-from oslo.i18n import _locale
-from oslo.i18n import _message
-
-
-__all__ = [
-    'TranslatorFactory',
-]
-
-
-class TranslatorFactory(object):
-    "Create translator functions"
-
-    def __init__(self, domain, localedir=None):
-        """Establish a set of translation functions for the domain.
-
-        :param domain: Name of translation domain,
-                       specifying a message catalog.
-        :type domain: str
-        :param localedir: Directory with translation catalogs.
-        :type localedir: str
-        """
-        self.domain = domain
-        if localedir is None:
-            variable_name = _locale.get_locale_dir_variable_name(domain)
-            localedir = os.environ.get(variable_name)
-        self.localedir = localedir
-
-    def _make_translation_func(self, domain=None):
-        """Return a translation function ready for use with messages.
-
-        The returned function takes a single value, the unicode string
-        to be translated.  The return type varies depending on whether
-        lazy translation is being done. When lazy translation is
-        enabled, :class:`Message` objects are returned instead of
-        regular :class:`unicode` strings.
-
-        The domain argument can be specified to override the default
-        from the factory, but the localedir from the factory is always
-        used because we assume the log-level translation catalogs are
-        installed in the same directory as the main application
-        catalog.
-
-        """
-        if domain is None:
-            domain = self.domain
-        t = gettext.translation(domain,
-                                localedir=self.localedir,
-                                fallback=True)
-        # Use the appropriate method of the translation object based
-        # on the python version.
-        m = t.gettext if six.PY3 else t.ugettext
-
-        def f(msg):
-            """oslo.i18n.gettextutils translation function."""
-            if _lazy.USE_LAZY:
-                return _message.Message(msg, domain=domain)
-            return m(msg)
-        return f
-
-    @property
-    def primary(self):
-        "The default translation function."
-        return self._make_translation_func()
-
-    def _make_log_translation_func(self, level):
-        return self._make_translation_func(self.domain + '-log-' + level)
-
-    @property
-    def log_info(self):
-        "Translate info-level log messages."
-        return self._make_log_translation_func('info')
-
-    @property
-    def log_warning(self):
-        "Translate warning-level log messages."
-        return self._make_log_translation_func('warning')
-
-    @property
-    def log_error(self):
-        "Translate error-level log messages."
-        return self._make_log_translation_func('error')
-
-    @property
-    def log_critical(self):
-        "Translate critical-level log messages."
-        return self._make_log_translation_func('critical')
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/fixture.py python-oslo.i18n-1.3.0/oslo/i18n/fixture.py
--- python-oslo.i18n-1.1.0/oslo/i18n/fixture.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/fixture.py	2015-01-08 14:46:13.000000000 -0500
@@ -9,57 +9,5 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-"""Test fixtures for working with oslo.i18n.
 
-"""
-
-import fixtures
-import six
-
-from oslo.i18n import _message
-
-
-class Translation(fixtures.Fixture):
-    """Fixture for managing translatable strings.
-
-    This class provides methods for creating translatable strings
-    using both lazy translation and immediate translation. It can be
-    used to generate the different types of messages returned from
-    oslo.i18n to test code that may need to know about the type to
-    handle them differently (for example, error handling in WSGI apps,
-    or logging).
-
-    Use this class to generate messages instead of toggling the global
-    lazy flag and using the regular translation factory.
-
-    """
-
-    def __init__(self, domain='test-domain'):
-        """Initialize the fixture.
-
-        :param domain: The translation domain. This is not expected to
-                       coincide with an actual set of message
-                       catalogs, but it can.
-        :type domain: str
-        """
-        self.domain = domain
-
-    def lazy(self, msg):
-        """Return a lazily translated message.
-
-        :param msg: Input message string. May optionally include
-                    positional or named string interpolation markers.
-        :type msg: str or unicode
-
-        """
-        return _message.Message(msg, domain=self.domain)
-
-    def immediate(self, msg):
-        """Return a string as though it had been translated immediately.
-
-        :param msg: Input message string. May optionally include
-                    positional or named string interpolation markers.
-        :type msg: str or unicode
-
-        """
-        return six.text_type(msg)
+from oslo_i18n.fixture import *  # noqa
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/_gettextutils.py python-oslo.i18n-1.3.0/oslo/i18n/_gettextutils.py
--- python-oslo.i18n-1.1.0/oslo/i18n/_gettextutils.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/_gettextutils.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,90 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""gettextutils provides a wrapper around gettext for OpenStack projects
-"""
-
-import copy
-import gettext
-import os
-
-from babel import localedata
-import six
-
-from oslo.i18n import _factory
-from oslo.i18n import _locale
-
-__all__ = [
-    'install',
-    'get_available_languages',
-]
-
-
-def install(domain):
-    """Install a _() function using the given translation domain.
-
-    Given a translation domain, install a _() function using gettext's
-    install() function.
-
-    The main difference from gettext.install() is that we allow
-    overriding the default localedir (e.g. /usr/share/locale) using
-    a translation-domain-specific environment variable (e.g.
-    NOVA_LOCALEDIR).
-
-    :param domain: the translation domain
-    """
-    from six import moves
-    tf = _factory.TranslatorFactory(domain)
-    moves.builtins.__dict__['_'] = tf.primary
-
-
-_AVAILABLE_LANGUAGES = {}
-
-
-def get_available_languages(domain):
-    """Lists the available languages for the given translation domain.
-
-    :param domain: the domain to get languages for
-    """
-    if domain in _AVAILABLE_LANGUAGES:
-        return copy.copy(_AVAILABLE_LANGUAGES[domain])
-
-    localedir = os.environ.get(_locale.get_locale_dir_variable_name(domain))
-    find = lambda x: gettext.find(domain,
-                                  localedir=localedir,
-                                  languages=[x])
-
-    # NOTE(mrodden): en_US should always be available (and first in case
-    # order matters) since our in-line message strings are en_US
-    language_list = ['en_US']
-    locale_identifiers = localedata.locale_identifiers()
-    language_list.extend(language for language in locale_identifiers
-                         if find(language))
-
-    # In Babel 1.3, locale_identifiers() doesn't list some OpenStack supported
-    # locales (e.g. 'zh_CN', and 'zh_TW') so we add the locales explicitly if
-    # necessary so that they are listed as supported.
-    aliases = {'zh': 'zh_CN',
-               'zh_Hant_HK': 'zh_HK',
-               'zh_Hant': 'zh_TW',
-               'fil': 'tl_PH'}
-
-    language_list.extend(alias for locale, alias in six.iteritems(aliases)
-                         if (locale in language_list and
-                             alias not in language_list))
-
-    _AVAILABLE_LANGUAGES[domain] = language_list
-    return copy.copy(language_list)
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/_i18n.py python-oslo.i18n-1.3.0/oslo/i18n/_i18n.py
--- python-oslo.i18n-1.1.0/oslo/i18n/_i18n.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/_i18n.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-"""Translation support for messages in this library.
-"""
-
-from oslo.i18n import _factory
-
-# Create the global translation functions.
-_translators = _factory.TranslatorFactory('oslo.i18n')
-
-# The primary translation function using the well-known name "_"
-_ = _translators.primary
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/__init__.py python-oslo.i18n-1.3.0/oslo/i18n/__init__.py
--- python-oslo.i18n-1.1.0/oslo/i18n/__init__.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/__init__.py	2015-01-08 14:46:13.000000000 -0500
@@ -10,7 +10,22 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from ._factory import *
-from ._gettextutils import *
-from ._lazy import *
-from ._translate import *
+import warnings
+
+from oslo_i18n._factory import *
+from oslo_i18n._gettextutils import *
+from oslo_i18n._lazy import *
+from oslo_i18n._translate import *
+
+
+def deprecated():
+    new_name = __name__.replace('.', '_')
+    warnings.warn(
+        ('The oslo namespace package is deprecated. Please use %s instead.' %
+         new_name),
+        DeprecationWarning,
+        stacklevel=3,
+    )
+
+
+deprecated()
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/_lazy.py python-oslo.i18n-1.3.0/oslo/i18n/_lazy.py
--- python-oslo.i18n-1.1.0/oslo/i18n/_lazy.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/_lazy.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,38 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-__all__ = [
-    'enable_lazy',
-]
-
-USE_LAZY = False
-
-
-def enable_lazy(enable=True):
-    """Convenience function for configuring _() to use lazy gettext
-
-    Call this at the start of execution to enable the gettextutils._
-    function to use lazy gettext functionality. This is useful if
-    your project is importing _ directly instead of using the
-    gettextutils.install() way of importing the _ function.
-
-    :param enable: Flag indicating whether lazy translation should be
-                   turned on or off.  Defaults to True.
-    :type enable: bool
-
-    """
-    global USE_LAZY
-    USE_LAZY = enable
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/_locale.py python-oslo.i18n-1.3.0/oslo/i18n/_locale.py
--- python-oslo.i18n-1.1.0/oslo/i18n/_locale.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/_locale.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-
-def get_locale_dir_variable_name(domain):
-    """Build environment variable name for  local dir.
-
-    Convert a translation domain name to a variable for specifying
-    a separate locale dir.
-
-    """
-    return domain.upper().replace('.', '_').replace('-', '_') + '_LOCALEDIR'
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/log.py python-oslo.i18n-1.3.0/oslo/i18n/log.py
--- python-oslo.i18n-1.1.0/oslo/i18n/log.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/log.py	2015-01-08 14:46:13.000000000 -0500
@@ -1,7 +1,3 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
 #    a copy of the License at
@@ -14,84 +10,4 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""logging utilities for translation
-"""
-
-from logging import handlers
-
-from oslo.i18n import _translate
-
-
-class TranslationHandler(handlers.MemoryHandler):
-    """Handler that translates records before logging them.
-
-    When lazy translation is enabled in the application (see
-    :func:`~oslo.i18n.enable_lazy`), the :class:`TranslationHandler`
-    uses its locale configuration setting to determine how to
-    translate LogRecord objects before forwarding them to the
-    logging.Handler.
-
-    When lazy translation is disabled, the message in the LogRecord is
-    converted to unicode without any changes and then forwarded to the
-    logging.Handler.
-
-    The handler can be configured declaratively in the
-    ``logging.conf`` as follows::
-
-        [handlers]
-        keys = translatedlog, translator
-
-        [handler_translatedlog]
-        class = handlers.WatchedFileHandler
-        args = ('/var/log/api-localized.log',)
-        formatter = context
-
-        [handler_translator]
-        class = oslo.i18n.log.TranslationHandler
-        target = translatedlog
-        args = ('zh_CN',)
-
-    If the specified locale is not available in the system, the handler will
-    log in the default locale.
-
-    """
-
-    def __init__(self, locale=None, target=None):
-        """Initialize a TranslationHandler
-
-        :param locale: locale to use for translating messages
-        :param target: logging.Handler object to forward
-                       LogRecord objects to after translation
-        """
-        # NOTE(luisg): In order to allow this handler to be a wrapper for
-        # other handlers, such as a FileHandler, and still be able to
-        # configure it using logging.conf, this handler has to extend
-        # MemoryHandler because only the MemoryHandlers' logging.conf
-        # parsing is implemented such that it accepts a target handler.
-        handlers.MemoryHandler.__init__(self, capacity=0, target=target)
-        self.locale = locale
-
-    def setFormatter(self, fmt):
-        self.target.setFormatter(fmt)
-
-    def emit(self, record):
-        # We save the message from the original record to restore it
-        # after translation, so other handlers are not affected by this
-        original_msg = record.msg
-        original_args = record.args
-
-        try:
-            self._translate_and_log_record(record)
-        finally:
-            record.msg = original_msg
-            record.args = original_args
-
-    def _translate_and_log_record(self, record):
-        record.msg = _translate.translate(record.msg, self.locale)
-
-        # In addition to translating the message, we also need to translate
-        # arguments that were passed to the log method that were not part
-        # of the main message e.g., log.info(_('Some message %s'), this_one))
-        record.args = _translate.translate_args(record.args, self.locale)
-
-        self.target.emit(record)
+from oslo_i18n.log import *  # noqa
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/_message.py python-oslo.i18n-1.3.0/oslo/i18n/_message.py
--- python-oslo.i18n-1.1.0/oslo/i18n/_message.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/_message.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,167 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-"""Private Message class for lazy translation support.
-"""
-
-import copy
-import gettext
-import locale
-import os
-
-import six
-
-from oslo.i18n import _locale
-from oslo.i18n import _translate
-
-
-class Message(six.text_type):
-    """A Message object is a unicode object that can be translated.
-
-    Translation of Message is done explicitly using the translate() method.
-    For all non-translation intents and purposes, a Message is simply unicode,
-    and can be treated as such.
-    """
-
-    def __new__(cls, msgid, msgtext=None, params=None,
-                domain='oslo', *args):
-        """Create a new Message object.
-
-        In order for translation to work gettext requires a message ID, this
-        msgid will be used as the base unicode text. It is also possible
-        for the msgid and the base unicode text to be different by passing
-        the msgtext parameter.
-        """
-        # If the base msgtext is not given, we use the default translation
-        # of the msgid (which is in English) just in case the system locale is
-        # not English, so that the base text will be in that locale by default.
-        if not msgtext:
-            msgtext = Message._translate_msgid(msgid, domain)
-        # We want to initialize the parent unicode with the actual object that
-        # would have been plain unicode if 'Message' was not enabled.
-        msg = super(Message, cls).__new__(cls, msgtext)
-        msg.msgid = msgid
-        msg.domain = domain
-        msg.params = params
-        return msg
-
-    def translate(self, desired_locale=None):
-        """Translate this message to the desired locale.
-
-        :param desired_locale: The desired locale to translate the message to,
-                               if no locale is provided the message will be
-                               translated to the system's default locale.
-
-        :returns: the translated message in unicode
-        """
-
-        translated_message = Message._translate_msgid(self.msgid,
-                                                      self.domain,
-                                                      desired_locale)
-        if self.params is None:
-            # No need for more translation
-            return translated_message
-
-        # This Message object may have been formatted with one or more
-        # Message objects as substitution arguments, given either as a single
-        # argument, part of a tuple, or as one or more values in a dictionary.
-        # When translating this Message we need to translate those Messages too
-        translated_params = _translate.translate_args(self.params,
-                                                      desired_locale)
-
-        translated_message = translated_message % translated_params
-
-        return translated_message
-
-    @staticmethod
-    def _translate_msgid(msgid, domain, desired_locale=None):
-        if not desired_locale:
-            system_locale = locale.getdefaultlocale()
-            # If the system locale is not available to the runtime use English
-            desired_locale = system_locale[0] or 'en_US'
-
-        locale_dir = os.environ.get(
-            _locale.get_locale_dir_variable_name(domain)
-        )
-        lang = gettext.translation(domain,
-                                   localedir=locale_dir,
-                                   languages=[desired_locale],
-                                   fallback=True)
-        translator = lang.gettext if six.PY3 else lang.ugettext
-
-        translated_message = translator(msgid)
-        return translated_message
-
-    def __mod__(self, other):
-        # When we mod a Message we want the actual operation to be performed
-        # by the parent class (i.e. unicode()), the only thing  we do here is
-        # save the original msgid and the parameters in case of a translation
-        params = self._sanitize_mod_params(other)
-        unicode_mod = super(Message, self).__mod__(params)
-        modded = Message(self.msgid,
-                         msgtext=unicode_mod,
-                         params=params,
-                         domain=self.domain)
-        return modded
-
-    def _sanitize_mod_params(self, other):
-        """Sanitize the object being modded with this Message.
-
-        - Add support for modding 'None' so translation supports it
-        - Trim the modded object, which can be a large dictionary, to only
-        those keys that would actually be used in a translation
-        - Snapshot the object being modded, in case the message is
-        translated, it will be used as it was when the Message was created
-        """
-        if other is None:
-            params = (other,)
-        elif isinstance(other, dict):
-            # Merge the dictionaries
-            # Copy each item in case one does not support deep copy.
-            params = {}
-            if isinstance(self.params, dict):
-                params.update((key, self._copy_param(val))
-                              for key, val in self.params.items())
-            params.update((key, self._copy_param(val))
-                          for key, val in other.items())
-        else:
-            params = self._copy_param(other)
-        return params
-
-    def _copy_param(self, param):
-        try:
-            return copy.deepcopy(param)
-        except Exception:
-            # Fallback to casting to unicode this will handle the
-            # python code-like objects that can't be deep-copied
-            return six.text_type(param)
-
-    def __add__(self, other):
-        from oslo.i18n._i18n import _
-        msg = _('Message objects do not support addition.')
-        raise TypeError(msg)
-
-    def __radd__(self, other):
-        return self.__add__(other)
-
-    if six.PY2:
-        def __str__(self):
-            # NOTE(luisg): Logging in python 2.6 tries to str() log records,
-            # and it expects specifically a UnicodeError in order to proceed.
-            from oslo.i18n._i18n import _
-            msg = _('Message objects do not support str() because they may '
-                    'contain non-ascii characters. '
-                    'Please use unicode() or translate() instead.')
-            raise UnicodeError(msg)
diff -Nru python-oslo.i18n-1.1.0/oslo/i18n/_translate.py python-oslo.i18n-1.3.0/oslo/i18n/_translate.py
--- python-oslo.i18n-1.1.0/oslo/i18n/_translate.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo/i18n/_translate.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,73 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import six
-
-__all__ = [
-    'translate',
-]
-
-
-def translate(obj, desired_locale=None):
-    """Gets the translated unicode representation of the given object.
-
-    If the object is not translatable it is returned as-is.
-
-    If the desired_locale argument is None the object is translated to
-    the system locale.
-
-    :param obj: the object to translate
-    :param desired_locale: the locale to translate the message to, if None the
-                           default system locale will be used
-    :returns: the translated object in unicode, or the original object if
-              it could not be translated
-
-    """
-    from oslo.i18n import _message  # avoid circular dependency at module level
-    message = obj
-    if not isinstance(message, _message.Message):
-        # If the object to translate is not already translatable,
-        # let's first get its unicode representation
-        message = six.text_type(obj)
-    if isinstance(message, _message.Message):
-        # Even after unicoding() we still need to check if we are
-        # running with translatable unicode before translating
-        return message.translate(desired_locale)
-    return obj
-
-
-def translate_args(args, desired_locale=None):
-    """Translates all the translatable elements of the given arguments object.
-
-    This method is used for translating the translatable values in method
-    arguments which include values of tuples or dictionaries.
-    If the object is not a tuple or a dictionary the object itself is
-    translated if it is translatable.
-
-    If the locale is None the object is translated to the system locale.
-
-    :param args: the args to translate
-    :param desired_locale: the locale to translate the args to, if None the
-                           default system locale will be used
-    :returns: a new args object with the translated contents of the original
-    """
-    if isinstance(args, tuple):
-        return tuple(translate(v, desired_locale) for v in args)
-    if isinstance(args, dict):
-        translated_dict = dict((key, translate(value, desired_locale))
-                               for key, value in six.iteritems(args))
-        return translated_dict
-    return translate(args, desired_locale)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/_factory.py python-oslo.i18n-1.3.0/oslo_i18n/_factory.py
--- python-oslo.i18n-1.1.0/oslo_i18n/_factory.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/_factory.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,110 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+"""Translation function factory
+"""
+
+import gettext
+import os
+
+import six
+
+from oslo_i18n import _lazy
+from oslo_i18n import _locale
+from oslo_i18n import _message
+
+
+__all__ = [
+    'TranslatorFactory',
+]
+
+
+class TranslatorFactory(object):
+    "Create translator functions"
+
+    def __init__(self, domain, localedir=None):
+        """Establish a set of translation functions for the domain.
+
+        :param domain: Name of translation domain,
+                       specifying a message catalog.
+        :type domain: str
+        :param localedir: Directory with translation catalogs.
+        :type localedir: str
+        """
+        self.domain = domain
+        if localedir is None:
+            variable_name = _locale.get_locale_dir_variable_name(domain)
+            localedir = os.environ.get(variable_name)
+        self.localedir = localedir
+
+    def _make_translation_func(self, domain=None):
+        """Return a translation function ready for use with messages.
+
+        The returned function takes a single value, the unicode string
+        to be translated.  The return type varies depending on whether
+        lazy translation is being done. When lazy translation is
+        enabled, :class:`Message` objects are returned instead of
+        regular :class:`unicode` strings.
+
+        The domain argument can be specified to override the default
+        from the factory, but the localedir from the factory is always
+        used because we assume the log-level translation catalogs are
+        installed in the same directory as the main application
+        catalog.
+
+        """
+        if domain is None:
+            domain = self.domain
+        t = gettext.translation(domain,
+                                localedir=self.localedir,
+                                fallback=True)
+        # Use the appropriate method of the translation object based
+        # on the python version.
+        m = t.gettext if six.PY3 else t.ugettext
+
+        def f(msg):
+            """oslo_i18n.gettextutils translation function."""
+            if _lazy.USE_LAZY:
+                return _message.Message(msg, domain=domain)
+            return m(msg)
+        return f
+
+    @property
+    def primary(self):
+        "The default translation function."
+        return self._make_translation_func()
+
+    def _make_log_translation_func(self, level):
+        return self._make_translation_func(self.domain + '-log-' + level)
+
+    @property
+    def log_info(self):
+        "Translate info-level log messages."
+        return self._make_log_translation_func('info')
+
+    @property
+    def log_warning(self):
+        "Translate warning-level log messages."
+        return self._make_log_translation_func('warning')
+
+    @property
+    def log_error(self):
+        "Translate error-level log messages."
+        return self._make_log_translation_func('error')
+
+    @property
+    def log_critical(self):
+        "Translate critical-level log messages."
+        return self._make_log_translation_func('critical')
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/fixture.py python-oslo.i18n-1.3.0/oslo_i18n/fixture.py
--- python-oslo.i18n-1.1.0/oslo_i18n/fixture.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/fixture.py	2015-01-08 14:46:14.000000000 -0500
@@ -0,0 +1,89 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+"""Test fixtures for working with oslo_i18n.
+
+"""
+
+import fixtures
+import six
+
+from oslo_i18n import _lazy
+from oslo_i18n import _message
+
+
+class Translation(fixtures.Fixture):
+    """Fixture for managing translatable strings.
+
+    This class provides methods for creating translatable strings
+    using both lazy translation and immediate translation. It can be
+    used to generate the different types of messages returned from
+    oslo_i18n to test code that may need to know about the type to
+    handle them differently (for example, error handling in WSGI apps,
+    or logging).
+
+    Use this class to generate messages instead of toggling the global
+    lazy flag and using the regular translation factory.
+
+    """
+
+    def __init__(self, domain='test-domain'):
+        """Initialize the fixture.
+
+        :param domain: The translation domain. This is not expected to
+                       coincide with an actual set of message
+                       catalogs, but it can.
+        :type domain: str
+        """
+        self.domain = domain
+
+    def lazy(self, msg):
+        """Return a lazily translated message.
+
+        :param msg: Input message string. May optionally include
+                    positional or named string interpolation markers.
+        :type msg: str or unicode
+
+        """
+        return _message.Message(msg, domain=self.domain)
+
+    def immediate(self, msg):
+        """Return a string as though it had been translated immediately.
+
+        :param msg: Input message string. May optionally include
+                    positional or named string interpolation markers.
+        :type msg: str or unicode
+
+        """
+        return six.text_type(msg)
+
+
+class ToggleLazy(fixtures.Fixture):
+    """Fixture to toggle lazy translation on or off for a test."""
+
+    def __init__(self, enabled):
+        """Force lazy translation on or off.
+
+        :param enabled: Flag controlling whether to enable or disable
+            lazy translation, passed to :func:`~oslo_i18n.enable_lazy`.
+        :type enabled: bool
+        """
+        super(ToggleLazy, self).__init__()
+        self._enabled = enabled
+        self._original_value = _lazy.USE_LAZY
+
+    def setUp(self):
+        super(ToggleLazy, self).setUp()
+        self.addCleanup(self._restore_original)
+        _lazy.enable_lazy(self._enabled)
+
+    def _restore_original(self):
+        _lazy.enable_lazy(self._original_value)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/_gettextutils.py python-oslo.i18n-1.3.0/oslo_i18n/_gettextutils.py
--- python-oslo.i18n-1.1.0/oslo_i18n/_gettextutils.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/_gettextutils.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,90 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""gettextutils provides a wrapper around gettext for OpenStack projects
+"""
+
+import copy
+import gettext
+import os
+
+from babel import localedata
+import six
+
+from oslo_i18n import _factory
+from oslo_i18n import _locale
+
+__all__ = [
+    'install',
+    'get_available_languages',
+]
+
+
+def install(domain):
+    """Install a _() function using the given translation domain.
+
+    Given a translation domain, install a _() function using gettext's
+    install() function.
+
+    The main difference from gettext.install() is that we allow
+    overriding the default localedir (e.g. /usr/share/locale) using
+    a translation-domain-specific environment variable (e.g.
+    NOVA_LOCALEDIR).
+
+    :param domain: the translation domain
+    """
+    from six import moves
+    tf = _factory.TranslatorFactory(domain)
+    moves.builtins.__dict__['_'] = tf.primary
+
+
+_AVAILABLE_LANGUAGES = {}
+
+
+def get_available_languages(domain):
+    """Lists the available languages for the given translation domain.
+
+    :param domain: the domain to get languages for
+    """
+    if domain in _AVAILABLE_LANGUAGES:
+        return copy.copy(_AVAILABLE_LANGUAGES[domain])
+
+    localedir = os.environ.get(_locale.get_locale_dir_variable_name(domain))
+    find = lambda x: gettext.find(domain,
+                                  localedir=localedir,
+                                  languages=[x])
+
+    # NOTE(mrodden): en_US should always be available (and first in case
+    # order matters) since our in-line message strings are en_US
+    language_list = ['en_US']
+    locale_identifiers = localedata.locale_identifiers()
+    language_list.extend(language for language in locale_identifiers
+                         if find(language))
+
+    # In Babel 1.3, locale_identifiers() doesn't list some OpenStack supported
+    # locales (e.g. 'zh_CN', and 'zh_TW') so we add the locales explicitly if
+    # necessary so that they are listed as supported.
+    aliases = {'zh': 'zh_CN',
+               'zh_Hant_HK': 'zh_HK',
+               'zh_Hant': 'zh_TW',
+               'fil': 'tl_PH'}
+
+    language_list.extend(alias for locale, alias in six.iteritems(aliases)
+                         if (locale in language_list and
+                             alias not in language_list))
+
+    _AVAILABLE_LANGUAGES[domain] = language_list
+    return copy.copy(language_list)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/_i18n.py python-oslo.i18n-1.3.0/oslo_i18n/_i18n.py
--- python-oslo.i18n-1.1.0/oslo_i18n/_i18n.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/_i18n.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,25 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+"""Translation support for messages in this library.
+"""
+
+from oslo_i18n import _factory
+
+# Create the global translation functions.
+_translators = _factory.TranslatorFactory('oslo.i18n')
+
+# The primary translation function using the well-known name "_"
+_ = _translators.primary
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/__init__.py python-oslo.i18n-1.3.0/oslo_i18n/__init__.py
--- python-oslo.i18n-1.1.0/oslo_i18n/__init__.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/__init__.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,16 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from ._factory import *
+from ._gettextutils import *
+from ._lazy import *
+from ._translate import *
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/_lazy.py python-oslo.i18n-1.3.0/oslo_i18n/_lazy.py
--- python-oslo.i18n-1.1.0/oslo_i18n/_lazy.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/_lazy.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,38 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+__all__ = [
+    'enable_lazy',
+]
+
+USE_LAZY = False
+
+
+def enable_lazy(enable=True):
+    """Convenience function for configuring _() to use lazy gettext
+
+    Call this at the start of execution to enable the gettextutils._
+    function to use lazy gettext functionality. This is useful if
+    your project is importing _ directly instead of using the
+    gettextutils.install() way of importing the _ function.
+
+    :param enable: Flag indicating whether lazy translation should be
+                   turned on or off.  Defaults to True.
+    :type enable: bool
+
+    """
+    global USE_LAZY
+    USE_LAZY = enable
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/_locale.py python-oslo.i18n-1.3.0/oslo_i18n/_locale.py
--- python-oslo.i18n-1.1.0/oslo_i18n/_locale.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/_locale.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,25 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+
+def get_locale_dir_variable_name(domain):
+    """Build environment variable name for  local dir.
+
+    Convert a translation domain name to a variable for specifying
+    a separate locale dir.
+
+    """
+    return domain.upper().replace('.', '_').replace('-', '_') + '_LOCALEDIR'
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/log.py python-oslo.i18n-1.3.0/oslo_i18n/log.py
--- python-oslo.i18n-1.1.0/oslo_i18n/log.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/log.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,97 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""logging utilities for translation
+"""
+
+from logging import handlers
+
+from oslo_i18n import _translate
+
+
+class TranslationHandler(handlers.MemoryHandler):
+    """Handler that translates records before logging them.
+
+    When lazy translation is enabled in the application (see
+    :func:`~oslo_i18n.enable_lazy`), the :class:`TranslationHandler`
+    uses its locale configuration setting to determine how to
+    translate LogRecord objects before forwarding them to the
+    logging.Handler.
+
+    When lazy translation is disabled, the message in the LogRecord is
+    converted to unicode without any changes and then forwarded to the
+    logging.Handler.
+
+    The handler can be configured declaratively in the
+    ``logging.conf`` as follows::
+
+        [handlers]
+        keys = translatedlog, translator
+
+        [handler_translatedlog]
+        class = handlers.WatchedFileHandler
+        args = ('/var/log/api-localized.log',)
+        formatter = context
+
+        [handler_translator]
+        class = oslo_i18n.log.TranslationHandler
+        target = translatedlog
+        args = ('zh_CN',)
+
+    If the specified locale is not available in the system, the handler will
+    log in the default locale.
+
+    """
+
+    def __init__(self, locale=None, target=None):
+        """Initialize a TranslationHandler
+
+        :param locale: locale to use for translating messages
+        :param target: logging.Handler object to forward
+                       LogRecord objects to after translation
+        """
+        # NOTE(luisg): In order to allow this handler to be a wrapper for
+        # other handlers, such as a FileHandler, and still be able to
+        # configure it using logging.conf, this handler has to extend
+        # MemoryHandler because only the MemoryHandlers' logging.conf
+        # parsing is implemented such that it accepts a target handler.
+        handlers.MemoryHandler.__init__(self, capacity=0, target=target)
+        self.locale = locale
+
+    def setFormatter(self, fmt):
+        self.target.setFormatter(fmt)
+
+    def emit(self, record):
+        # We save the message from the original record to restore it
+        # after translation, so other handlers are not affected by this
+        original_msg = record.msg
+        original_args = record.args
+
+        try:
+            self._translate_and_log_record(record)
+        finally:
+            record.msg = original_msg
+            record.args = original_args
+
+    def _translate_and_log_record(self, record):
+        record.msg = _translate.translate(record.msg, self.locale)
+
+        # In addition to translating the message, we also need to translate
+        # arguments that were passed to the log method that were not part
+        # of the main message e.g., log.info(_('Some message %s'), this_one))
+        record.args = _translate.translate_args(record.args, self.locale)
+
+        self.target.emit(record)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/_message.py python-oslo.i18n-1.3.0/oslo_i18n/_message.py
--- python-oslo.i18n-1.1.0/oslo_i18n/_message.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/_message.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,167 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+"""Private Message class for lazy translation support.
+"""
+
+import copy
+import gettext
+import locale
+import os
+
+import six
+
+from oslo_i18n import _locale
+from oslo_i18n import _translate
+
+
+class Message(six.text_type):
+    """A Message object is a unicode object that can be translated.
+
+    Translation of Message is done explicitly using the translate() method.
+    For all non-translation intents and purposes, a Message is simply unicode,
+    and can be treated as such.
+    """
+
+    def __new__(cls, msgid, msgtext=None, params=None,
+                domain='oslo', *args):
+        """Create a new Message object.
+
+        In order for translation to work gettext requires a message ID, this
+        msgid will be used as the base unicode text. It is also possible
+        for the msgid and the base unicode text to be different by passing
+        the msgtext parameter.
+        """
+        # If the base msgtext is not given, we use the default translation
+        # of the msgid (which is in English) just in case the system locale is
+        # not English, so that the base text will be in that locale by default.
+        if not msgtext:
+            msgtext = Message._translate_msgid(msgid, domain)
+        # We want to initialize the parent unicode with the actual object that
+        # would have been plain unicode if 'Message' was not enabled.
+        msg = super(Message, cls).__new__(cls, msgtext)
+        msg.msgid = msgid
+        msg.domain = domain
+        msg.params = params
+        return msg
+
+    def translate(self, desired_locale=None):
+        """Translate this message to the desired locale.
+
+        :param desired_locale: The desired locale to translate the message to,
+                               if no locale is provided the message will be
+                               translated to the system's default locale.
+
+        :returns: the translated message in unicode
+        """
+
+        translated_message = Message._translate_msgid(self.msgid,
+                                                      self.domain,
+                                                      desired_locale)
+        if self.params is None:
+            # No need for more translation
+            return translated_message
+
+        # This Message object may have been formatted with one or more
+        # Message objects as substitution arguments, given either as a single
+        # argument, part of a tuple, or as one or more values in a dictionary.
+        # When translating this Message we need to translate those Messages too
+        translated_params = _translate.translate_args(self.params,
+                                                      desired_locale)
+
+        translated_message = translated_message % translated_params
+
+        return translated_message
+
+    @staticmethod
+    def _translate_msgid(msgid, domain, desired_locale=None):
+        if not desired_locale:
+            system_locale = locale.getdefaultlocale()
+            # If the system locale is not available to the runtime use English
+            desired_locale = system_locale[0] or 'en_US'
+
+        locale_dir = os.environ.get(
+            _locale.get_locale_dir_variable_name(domain)
+        )
+        lang = gettext.translation(domain,
+                                   localedir=locale_dir,
+                                   languages=[desired_locale],
+                                   fallback=True)
+        translator = lang.gettext if six.PY3 else lang.ugettext
+
+        translated_message = translator(msgid)
+        return translated_message
+
+    def __mod__(self, other):
+        # When we mod a Message we want the actual operation to be performed
+        # by the parent class (i.e. unicode()), the only thing  we do here is
+        # save the original msgid and the parameters in case of a translation
+        params = self._sanitize_mod_params(other)
+        unicode_mod = super(Message, self).__mod__(params)
+        modded = Message(self.msgid,
+                         msgtext=unicode_mod,
+                         params=params,
+                         domain=self.domain)
+        return modded
+
+    def _sanitize_mod_params(self, other):
+        """Sanitize the object being modded with this Message.
+
+        - Add support for modding 'None' so translation supports it
+        - Trim the modded object, which can be a large dictionary, to only
+        those keys that would actually be used in a translation
+        - Snapshot the object being modded, in case the message is
+        translated, it will be used as it was when the Message was created
+        """
+        if other is None:
+            params = (other,)
+        elif isinstance(other, dict):
+            # Merge the dictionaries
+            # Copy each item in case one does not support deep copy.
+            params = {}
+            if isinstance(self.params, dict):
+                params.update((key, self._copy_param(val))
+                              for key, val in self.params.items())
+            params.update((key, self._copy_param(val))
+                          for key, val in other.items())
+        else:
+            params = self._copy_param(other)
+        return params
+
+    def _copy_param(self, param):
+        try:
+            return copy.deepcopy(param)
+        except Exception:
+            # Fallback to casting to unicode this will handle the
+            # python code-like objects that can't be deep-copied
+            return six.text_type(param)
+
+    def __add__(self, other):
+        from oslo_i18n._i18n import _
+        msg = _('Message objects do not support addition.')
+        raise TypeError(msg)
+
+    def __radd__(self, other):
+        return self.__add__(other)
+
+    if six.PY2:
+        def __str__(self):
+            # NOTE(luisg): Logging in python 2.6 tries to str() log records,
+            # and it expects specifically a UnicodeError in order to proceed.
+            from oslo_i18n._i18n import _
+            msg = _('Message objects do not support str() because they may '
+                    'contain non-ascii characters. '
+                    'Please use unicode() or translate() instead.')
+            raise UnicodeError(msg)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/fakes.py python-oslo.i18n-1.3.0/oslo_i18n/tests/fakes.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/fakes.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/fakes.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,59 @@
+# Copyright 2012 Intel Inc, OpenStack Foundation.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+Fakes For translation tests.
+"""
+
+import gettext
+
+
+class FakeTranslations(gettext.GNUTranslations):
+    """A test GNUTranslations class that takes a map of msg -> translations."""
+
+    def __init__(self, translations):
+        self.translations = translations
+
+    # used by Python 3
+    def gettext(self, msgid):
+        return self.translations.get(msgid, msgid)
+
+    # used by Python 2
+    def ugettext(self, msgid):
+        return self.translations.get(msgid, msgid)
+
+    @staticmethod
+    def translator(locales_map):
+        """Build mock translator for the given locales.
+
+        Returns a mock gettext.translation function that uses
+        individual TestTranslations to translate in the given locales.
+
+        :param locales_map: A map from locale name to a translations map.
+                            {
+                             'es': {'Hi': 'Hola', 'Bye': 'Adios'},
+                             'zh': {'Hi': 'Ni Hao', 'Bye': 'Zaijian'}
+                            }
+
+
+        """
+        def _translation(domain, localedir=None,
+                         languages=None, fallback=None):
+            if languages:
+                language = languages[0]
+                if language in locales_map:
+                    return FakeTranslations(locales_map[language])
+            return gettext.NullTranslations()
+        return _translation
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_factory.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_factory.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_factory.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_factory.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,91 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import mock
+from oslotest import base as test_base
+import six
+
+from oslo_i18n import _factory
+from oslo_i18n import _lazy
+from oslo_i18n import _message
+
+
+class TranslatorFactoryTest(test_base.BaseTestCase):
+
+    def setUp(self):
+        super(TranslatorFactoryTest, self).setUp()
+        # remember so we can reset to it later in case it changes
+        self._USE_LAZY = _lazy.USE_LAZY
+
+    def tearDown(self):
+        # reset to value before test
+        _lazy.USE_LAZY = self._USE_LAZY
+        super(TranslatorFactoryTest, self).tearDown()
+
+    def test_lazy(self):
+        _lazy.enable_lazy(True)
+        with mock.patch.object(_message, 'Message') as msg:
+            tf = _factory.TranslatorFactory('domain')
+            tf.primary('some text')
+            msg.assert_called_with('some text', domain='domain')
+
+    def test_not_lazy(self):
+        _lazy.enable_lazy(False)
+        with mock.patch.object(_message, 'Message') as msg:
+            msg.side_effect = AssertionError('should not use Message')
+            tf = _factory.TranslatorFactory('domain')
+            tf.primary('some text')
+
+    def test_change_lazy(self):
+        _lazy.enable_lazy(True)
+        tf = _factory.TranslatorFactory('domain')
+        r = tf.primary('some text')
+        self.assertIsInstance(r, _message.Message)
+        _lazy.enable_lazy(False)
+        r = tf.primary('some text')
+        # Python 2.6 doesn't have assertNotIsInstance().
+        self.assertFalse(isinstance(r, _message.Message))
+
+    def test_py2(self):
+        _lazy.enable_lazy(False)
+        with mock.patch.object(six, 'PY3', False):
+            with mock.patch('gettext.translation') as translation:
+                trans = mock.Mock()
+                translation.return_value = trans
+                trans.gettext.side_effect = AssertionError(
+                    'should have called ugettext')
+                tf = _factory.TranslatorFactory('domain')
+                tf.primary('some text')
+                trans.ugettext.assert_called_with('some text')
+
+    def test_py3(self):
+        _lazy.enable_lazy(False)
+        with mock.patch.object(six, 'PY3', True):
+            with mock.patch('gettext.translation') as translation:
+                trans = mock.Mock()
+                translation.return_value = trans
+                trans.ugettext.side_effect = AssertionError(
+                    'should have called gettext')
+                tf = _factory.TranslatorFactory('domain')
+                tf.primary('some text')
+                trans.gettext.assert_called_with('some text')
+
+    def test_log_level_domain_name(self):
+        with mock.patch.object(_factory.TranslatorFactory,
+                               '_make_translation_func') as mtf:
+            tf = _factory.TranslatorFactory('domain')
+            tf._make_log_translation_func('mylevel')
+            mtf.assert_called_with('domain-log-mylevel')
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_fixture.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_fixture.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_fixture.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_fixture.py	2015-01-08 14:46:14.000000000 -0500
@@ -0,0 +1,74 @@
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from oslotest import base as test_base
+import six
+
+from oslo_i18n import _lazy
+from oslo_i18n import _message
+from oslo_i18n import fixture
+
+
+class TranslationFixtureTest(test_base.BaseTestCase):
+
+    def setUp(self):
+        super(TranslationFixtureTest, self).setUp()
+        self.trans_fixture = self.useFixture(fixture.Translation())
+
+    def test_lazy(self):
+        msg = self.trans_fixture.lazy('this is a lazy message')
+        self.assertIsInstance(msg, _message.Message)
+        self.assertEqual(msg.msgid, 'this is a lazy message')
+
+    def test_immediate(self):
+        msg = self.trans_fixture.immediate('this is a lazy message')
+        # Python 2.6 does not have assertNotIsInstance
+        self.assertFalse(isinstance(msg, _message.Message))
+        self.assertIsInstance(msg, six.text_type)
+        self.assertEqual(msg, u'this is a lazy message')
+
+
+class ToggleLazyFixtureText(test_base.BaseTestCase):
+
+    def test_on_on(self):
+        _lazy.USE_LAZY = True
+        f = fixture.ToggleLazy(True)
+        f.setUp()
+        self.assertTrue(_lazy.USE_LAZY)
+        f._restore_original()
+        self.assertTrue(_lazy.USE_LAZY)
+
+    def test_on_off(self):
+        _lazy.USE_LAZY = True
+        f = fixture.ToggleLazy(False)
+        f.setUp()
+        self.assertFalse(_lazy.USE_LAZY)
+        f._restore_original()
+        self.assertTrue(_lazy.USE_LAZY)
+
+    def test_off_on(self):
+        _lazy.USE_LAZY = False
+        f = fixture.ToggleLazy(True)
+        f.setUp()
+        self.assertTrue(_lazy.USE_LAZY)
+        f._restore_original()
+        self.assertFalse(_lazy.USE_LAZY)
+
+    def test_off_off(self):
+        _lazy.USE_LAZY = False
+        f = fixture.ToggleLazy(False)
+        f.setUp()
+        self.assertFalse(_lazy.USE_LAZY)
+        f._restore_original()
+        self.assertFalse(_lazy.USE_LAZY)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_gettextutils.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_gettextutils.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_gettextutils.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_gettextutils.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,128 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import gettext
+import logging
+
+from babel import localedata
+import mock
+from oslotest import base as test_base
+from oslotest import moxstubout
+import six
+
+from oslo_i18n import _factory
+from oslo_i18n import _gettextutils
+from oslo_i18n import _lazy
+from oslo_i18n import _message
+
+
+LOG = logging.getLogger(__name__)
+
+
+class GettextTest(test_base.BaseTestCase):
+
+    def setUp(self):
+        super(GettextTest, self).setUp()
+        moxfixture = self.useFixture(moxstubout.MoxStubout())
+        self.stubs = moxfixture.stubs
+        self.mox = moxfixture.mox
+        # remember so we can reset to it later in case it changes
+        self._USE_LAZY = _lazy.USE_LAZY
+        self.t = _factory.TranslatorFactory('oslo_i18n.test')
+
+    def tearDown(self):
+        # reset to value before test
+        _lazy.USE_LAZY = self._USE_LAZY
+        super(GettextTest, self).tearDown()
+
+    def test_gettext_does_not_blow_up(self):
+        LOG.info(self.t.primary('test'))
+
+    def test__gettextutils_install(self):
+        _gettextutils.install('blaa')
+        _lazy.enable_lazy(False)
+        self.assertTrue(isinstance(self.t.primary('A String'),
+                                   six.text_type))
+
+        _gettextutils.install('blaa')
+        _lazy.enable_lazy(True)
+        self.assertTrue(isinstance(self.t.primary('A Message'),
+                                   _message.Message))
+
+    def test_gettext_install_looks_up_localedir(self):
+        with mock.patch('os.environ.get') as environ_get:
+            with mock.patch('gettext.install'):
+                environ_get.return_value = '/foo/bar'
+                _gettextutils.install('blaa')
+                environ_get.assert_calls([mock.call('BLAA_LOCALEDIR')])
+
+    def test_gettext_install_updates_builtins(self):
+        with mock.patch('os.environ.get') as environ_get:
+            with mock.patch('gettext.install'):
+                environ_get.return_value = '/foo/bar'
+                if '_' in six.moves.builtins.__dict__:
+                    del six.moves.builtins.__dict__['_']
+                _gettextutils.install('blaa')
+                self.assertIn('_', six.moves.builtins.__dict__)
+
+    def test_get_available_languages(self):
+        # All the available languages for which locale data is available
+        def _mock_locale_identifiers():
+            # 'zh', 'zh_Hant'. 'zh_Hant_HK', 'fil' all have aliases
+            # missing from babel but we add them in _gettextutils, we
+            # test that here too
+            return ['zh', 'es', 'nl', 'fr', 'zh_Hant', 'zh_Hant_HK', 'fil']
+
+        self.stubs.Set(localedata,
+                       'list' if hasattr(localedata, 'list')
+                       else 'locale_identifiers',
+                       _mock_locale_identifiers)
+
+        # Only the languages available for a specific translation domain
+        def _mock_gettext_find(domain, localedir=None, languages=None, all=0):
+            languages = languages or []
+            if domain == 'domain_1':
+                return 'translation-file' if any(x in ['zh', 'es', 'fil']
+                                                 for x in languages) else None
+            elif domain == 'domain_2':
+                return 'translation-file' if any(x in ['fr', 'zh_Hant']
+                                                 for x in languages) else None
+            return None
+        self.stubs.Set(gettext, 'find', _mock_gettext_find)
+
+        # en_US should always be available no matter the domain
+        # and it should also always be the first element since order matters
+        domain_1_languages = _gettextutils.get_available_languages('domain_1')
+        domain_2_languages = _gettextutils.get_available_languages('domain_2')
+        self.assertEqual('en_US', domain_1_languages[0])
+        self.assertEqual('en_US', domain_2_languages[0])
+        # The domain languages should be included after en_US with
+        # with their respective aliases when it applies
+        self.assertEqual(6, len(domain_1_languages))
+        self.assertIn('zh', domain_1_languages)
+        self.assertIn('zh_CN', domain_1_languages)
+        self.assertIn('es', domain_1_languages)
+        self.assertIn('fil', domain_1_languages)
+        self.assertIn('tl_PH', domain_1_languages)
+        self.assertEqual(4, len(domain_2_languages))
+        self.assertIn('fr', domain_2_languages)
+        self.assertIn('zh_Hant', domain_2_languages)
+        self.assertIn('zh_TW', domain_2_languages)
+        self.assertEqual(2, len(_gettextutils._AVAILABLE_LANGUAGES))
+        # Now test an unknown domain, only en_US should be included
+        unknown_domain_languages = _gettextutils.get_available_languages('huh')
+        self.assertEqual(1, len(unknown_domain_languages))
+        self.assertIn('en_US', unknown_domain_languages)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_handler.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_handler.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_handler.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_handler.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,106 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import logging
+
+import mock
+from oslotest import base as test_base
+import six
+
+from oslo_i18n import _message
+from oslo_i18n import log as i18n_log
+from oslo_i18n.tests import fakes
+
+LOG = logging.getLogger(__name__)
+
+
+class TranslationHandlerTestCase(test_base.BaseTestCase):
+
+    def setUp(self):
+        super(TranslationHandlerTestCase, self).setUp()
+
+        self.stream = six.StringIO()
+        self.destination_handler = logging.StreamHandler(self.stream)
+        self.translation_handler = i18n_log.TranslationHandler('zh_CN')
+        self.translation_handler.setTarget(self.destination_handler)
+
+        self.logger = logging.getLogger('localehander_logger')
+        self.logger.setLevel(logging.DEBUG)
+        self.logger.addHandler(self.translation_handler)
+
+    def test_set_formatter(self):
+        formatter = 'some formatter'
+        self.translation_handler.setFormatter(formatter)
+        self.assertEqual(formatter, self.translation_handler.target.formatter)
+
+    @mock.patch('gettext.translation')
+    def test_emit_translated_message(self, mock_translation):
+        log_message = 'A message to be logged'
+        log_message_translation = 'A message to be logged in Chinese'
+        translations = {log_message: log_message_translation}
+        translations_map = {'zh_CN': translations}
+        translator = fakes.FakeTranslations.translator(translations_map)
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(log_message)
+
+        self.logger.info(msg)
+        self.assertIn(log_message_translation, self.stream.getvalue())
+
+    @mock.patch('gettext.translation')
+    def test_emit_translated_message_with_args(self, mock_translation):
+        log_message = 'A message to be logged %s'
+        log_message_translation = 'A message to be logged in Chinese %s'
+        log_arg = 'Arg to be logged'
+        log_arg_translation = 'An arg to be logged in Chinese'
+
+        translations = {log_message: log_message_translation,
+                        log_arg: log_arg_translation}
+        translations_map = {'zh_CN': translations}
+        translator = fakes.FakeTranslations.translator(translations_map)
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(log_message)
+        arg = _message.Message(log_arg)
+
+        self.logger.info(msg, arg)
+        self.assertIn(log_message_translation % log_arg_translation,
+                      self.stream.getvalue())
+
+    @mock.patch('gettext.translation')
+    def test_emit_translated_message_with_named_args(self, mock_translation):
+        log_message = 'A message to be logged %(arg1)s $(arg2)s'
+        log_message_translation = 'Chinese msg to be logged %(arg1)s $(arg2)s'
+        log_arg_1 = 'Arg1 to be logged'
+        log_arg_1_translation = 'Arg1 to be logged in Chinese'
+        log_arg_2 = 'Arg2 to be logged'
+        log_arg_2_translation = 'Arg2 to be logged in Chinese'
+
+        translations = {log_message: log_message_translation,
+                        log_arg_1: log_arg_1_translation,
+                        log_arg_2: log_arg_2_translation}
+        translations_map = {'zh_CN': translations}
+        translator = fakes.FakeTranslations.translator(translations_map)
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(log_message)
+        arg_1 = _message.Message(log_arg_1)
+        arg_2 = _message.Message(log_arg_2)
+
+        self.logger.info(msg, {'arg1': arg_1, 'arg2': arg_2})
+        translation = log_message_translation % {'arg1': log_arg_1_translation,
+                                                 'arg2': log_arg_2_translation}
+        self.assertIn(translation, self.stream.getvalue())
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_lazy.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_lazy.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_lazy.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_lazy.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,40 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from oslotest import base as test_base
+
+from oslo_i18n import _lazy
+
+
+class LazyTest(test_base.BaseTestCase):
+
+    def setUp(self):
+        super(LazyTest, self).setUp()
+        self._USE_LAZY = _lazy.USE_LAZY
+
+    def tearDown(self):
+        _lazy.USE_LAZY = self._USE_LAZY
+        super(LazyTest, self).tearDown()
+
+    def test_enable_lazy(self):
+        _lazy.USE_LAZY = False
+        _lazy.enable_lazy()
+        self.assertTrue(_lazy.USE_LAZY)
+
+    def test_disable_lazy(self):
+        _lazy.USE_LAZY = True
+        _lazy.enable_lazy(False)
+        self.assertFalse(_lazy.USE_LAZY)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_locale_dir_variable.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_locale_dir_variable.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_locale_dir_variable.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_locale_dir_variable.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,32 @@
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from oslotest import base as test_base
+import testscenarios.testcase
+
+from oslo_i18n import _locale
+
+
+class LocaleDirVariableTest(testscenarios.testcase.WithScenarios,
+                            test_base.BaseTestCase):
+
+    scenarios = [
+        ('simple', {'domain': 'simple', 'expected': 'SIMPLE_LOCALEDIR'}),
+        ('with_dot', {'domain': 'one.two', 'expected': 'ONE_TWO_LOCALEDIR'}),
+        ('with_dash', {'domain': 'one-two', 'expected': 'ONE_TWO_LOCALEDIR'}),
+    ]
+
+    def test_make_variable_name(self):
+        var = _locale.get_locale_dir_variable_name(self.domain)
+        self.assertEqual(self.expected, var)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_logging.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_logging.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_logging.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_logging.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,42 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import mock
+from oslotest import base as test_base
+
+from oslo_i18n import _factory
+
+
+class LogLevelTranslationsTest(test_base.BaseTestCase):
+
+    def test_info(self):
+        self._test('info')
+
+    def test_warning(self):
+        self._test('warning')
+
+    def test_error(self):
+        self._test('error')
+
+    def test_critical(self):
+        self._test('critical')
+
+    def _test(self, level):
+        with mock.patch.object(_factory.TranslatorFactory,
+                               '_make_translation_func') as mtf:
+            tf = _factory.TranslatorFactory('domain')
+            getattr(tf, 'log_%s' % level)
+            mtf.assert_called_with('domain-log-%s' % level)
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_message.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_message.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_message.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_message.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,518 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from __future__ import unicode_literals
+
+import logging
+
+import mock
+from oslotest import base as test_base
+import six
+import testtools
+
+from oslo_i18n import _message
+from oslo_i18n.tests import fakes
+from oslo_i18n.tests import utils
+
+LOG = logging.getLogger(__name__)
+
+
+class MessageTestCase(test_base.BaseTestCase):
+    """Unit tests for locale Message class."""
+
+    def test_message_id_and_message_text(self):
+        message = _message.Message('1')
+        self.assertEqual('1', message.msgid)
+        self.assertEqual('1', message)
+        message = _message.Message('1', msgtext='A')
+        self.assertEqual('1', message.msgid)
+        self.assertEqual('A', message)
+
+    def test_message_is_unicode(self):
+        message = _message.Message('some %s') % 'message'
+        self.assertIsInstance(message, six.text_type)
+
+    @mock.patch('locale.getdefaultlocale')
+    @mock.patch('gettext.translation')
+    def test_create_message_non_english_default_locale(self,
+                                                       mock_translation,
+                                                       mock_getdefaultlocale):
+        msgid = 'A message in English'
+        es_translation = 'A message in Spanish'
+
+        es_translations = {msgid: es_translation}
+        translations_map = {'es': es_translations}
+        translator = fakes.FakeTranslations.translator(translations_map)
+        mock_translation.side_effect = translator
+        mock_getdefaultlocale.return_value = ('es',)
+
+        message = _message.Message(msgid)
+
+        # The base representation of the message is in Spanish, as well as
+        # the default translation, since the default locale was Spanish.
+        self.assertEqual(es_translation, message)
+        self.assertEqual(es_translation, message.translate())
+
+    def test_translate_returns_unicode(self):
+        message = _message.Message('some %s') % 'message'
+        self.assertIsInstance(message.translate(), six.text_type)
+
+    def test_mod_with_named_parameters(self):
+        msgid = ("%(description)s\nCommand: %(cmd)s\n"
+                 "Exit code: %(exit_code)s\nStdout: %(stdout)r\n"
+                 "Stderr: %(stderr)r %%(something)s")
+        params = {'description': 'test1',
+                  'cmd': 'test2',
+                  'exit_code': 'test3',
+                  'stdout': 'test4',
+                  'stderr': 'test5',
+                  'something': 'trimmed'}
+
+        result = _message.Message(msgid) % params
+
+        expected = msgid % params
+        self.assertEqual(result, expected)
+        self.assertEqual(result.translate(), expected)
+
+    def test_multiple_mod_with_named_parameter(self):
+        msgid = ("%(description)s\nCommand: %(cmd)s\n"
+                 "Exit code: %(exit_code)s\nStdout: %(stdout)r\n"
+                 "Stderr: %(stderr)r")
+        params = {'description': 'test1',
+                  'cmd': 'test2',
+                  'exit_code': 'test3',
+                  'stdout': 'test4',
+                  'stderr': 'test5'}
+
+        # Run string interpolation the first time to make a new Message
+        first = _message.Message(msgid) % params
+
+        # Run string interpolation on the new Message, to replicate
+        # one of the error paths with some Exception classes we've
+        # implemented in OpenStack. We should receive a second Message
+        # object, but the translation results should be the same.
+        #
+        # The production code that triggers this problem does something
+        # like:
+        #
+        #    msg = _('there was a problem %(name)s') % {'name': 'some value'}
+        #    LOG.error(msg)
+        #    raise BadExceptionClass(msg)
+        #
+        # where BadExceptionClass does something like:
+        #
+        #    class BadExceptionClass(Exception):
+        #      def __init__(self, msg, **kwds):
+        #         super(BadExceptionClass, self).__init__(msg % kwds)
+        #
+        expected = first % {}
+
+        # Base message id should be the same
+        self.assertEqual(first.msgid, expected.msgid)
+
+        # Preserved arguments should be the same
+        self.assertEqual(first.params, expected.params)
+
+        # Should have different objects
+        self.assertIsNot(expected, first)
+
+        # Final translations should be the same
+        self.assertEqual(expected.translate(), first.translate())
+
+    def test_mod_with_named_parameters_no_space(self):
+        msgid = ("Request: %(method)s http://%(server)s:"
+                 "%(port)s%(url)s with headers %(headers)s")
+        params = {'method': 'POST',
+                  'server': 'test1',
+                  'port': 1234,
+                  'url': 'test2',
+                  'headers': {'h1': 'val1'}}
+
+        result = _message.Message(msgid) % params
+
+        expected = msgid % params
+        self.assertEqual(result, expected)
+        self.assertEqual(result.translate(), expected)
+
+    def test_mod_with_dict_parameter(self):
+        msgid = "Test that we can inject a dictionary %s"
+        params = {'description': 'test1'}
+
+        result = _message.Message(msgid) % params
+
+        expected = msgid % params
+        self.assertEqual(expected, result)
+        self.assertEqual(expected, result.translate())
+
+    def test_mod_with_integer_parameters(self):
+        msgid = "Some string with params: %d"
+        params = [0, 1, 10, 24124]
+
+        messages = []
+        results = []
+        for param in params:
+            messages.append(msgid % param)
+            results.append(_message.Message(msgid) % param)
+
+        for message, result in zip(messages, results):
+            self.assertEqual(type(result), _message.Message)
+            self.assertEqual(result.translate(), message)
+
+            # simulate writing out as string
+            result_str = '%s' % result.translate()
+            self.assertEqual(result_str, message)
+            self.assertEqual(result, message)
+
+    def test_mod_copies_parameters(self):
+        msgid = "Found object: %(current_value)s"
+        changing_dict = {'current_value': 1}
+        # A message created with some params
+        result = _message.Message(msgid) % changing_dict
+        # The parameters may change
+        changing_dict['current_value'] = 2
+        # Even if the param changes when the message is
+        # translated it should use the original param
+        self.assertEqual(result.translate(), 'Found object: 1')
+
+    def test_mod_deep_copies_parameters(self):
+        msgid = "Found list: %(current_list)s"
+        changing_list = list([1, 2, 3])
+        params = {'current_list': changing_list}
+        # Apply the params
+        result = _message.Message(msgid) % params
+        # Change the list
+        changing_list.append(4)
+        # Even though the list changed the message
+        # translation should use the original list
+        self.assertEqual(result.translate(), "Found list: [1, 2, 3]")
+
+    def test_mod_deep_copies_param_nodeep_param(self):
+        msgid = "Value: %s"
+        params = utils.NoDeepCopyObject(5)
+        # Apply the params
+        result = _message.Message(msgid) % params
+        self.assertEqual(result.translate(), "Value: 5")
+
+    def test_mod_deep_copies_param_nodeep_dict(self):
+        msgid = "Values: %(val1)s %(val2)s"
+        params = {'val1': 1, 'val2': utils.NoDeepCopyObject(2)}
+        # Apply the params
+        result = _message.Message(msgid) % params
+        self.assertEqual(result.translate(), "Values: 1 2")
+
+        # Apply again to make sure other path works as well
+        params = {'val1': 3, 'val2': utils.NoDeepCopyObject(4)}
+        result = _message.Message(msgid) % params
+        self.assertEqual(result.translate(), "Values: 3 4")
+
+    def test_mod_returns_a_copy(self):
+        msgid = "Some msgid string: %(test1)s %(test2)s"
+        message = _message.Message(msgid)
+        m1 = message % {'test1': 'foo', 'test2': 'bar'}
+        m2 = message % {'test1': 'foo2', 'test2': 'bar2'}
+
+        self.assertIsNot(message, m1)
+        self.assertIsNot(message, m2)
+        self.assertEqual(m1.translate(),
+                         msgid % {'test1': 'foo', 'test2': 'bar'})
+        self.assertEqual(m2.translate(),
+                         msgid % {'test1': 'foo2', 'test2': 'bar2'})
+
+    def test_mod_with_none_parameter(self):
+        msgid = "Some string with params: %s"
+        message = _message.Message(msgid) % None
+        self.assertEqual(msgid % None, message)
+        self.assertEqual(msgid % None, message.translate())
+
+    def test_mod_with_missing_parameters(self):
+        msgid = "Some string with params: %s %s"
+        test_me = lambda: _message.Message(msgid) % 'just one'
+        # Just like with strings missing parameters raise TypeError
+        self.assertRaises(TypeError, test_me)
+
+    def test_mod_with_extra_parameters(self):
+        msgid = "Some string with params: %(param1)s %(param2)s"
+        params = {'param1': 'test',
+                  'param2': 'test2',
+                  'param3': 'notinstring'}
+
+        result = _message.Message(msgid) % params
+
+        expected = msgid % params
+        self.assertEqual(result, expected)
+        self.assertEqual(result.translate(), expected)
+
+        # Make sure unused params still there
+        self.assertEqual(result.params.keys(), params.keys())
+
+    def test_mod_with_missing_named_parameters(self):
+        msgid = ("Some string with params: %(param1)s %(param2)s"
+                 " and a missing one %(missing)s")
+        params = {'param1': 'test',
+                  'param2': 'test2'}
+
+        test_me = lambda: _message.Message(msgid) % params
+        # Just like with strings missing named parameters raise KeyError
+        self.assertRaises(KeyError, test_me)
+
+    def test_add_disabled(self):
+        msgid = "A message"
+        test_me = lambda: _message.Message(msgid) + ' some string'
+        self.assertRaises(TypeError, test_me)
+
+    def test_radd_disabled(self):
+        msgid = "A message"
+        test_me = lambda: utils.SomeObject('test') + _message.Message(msgid)
+        self.assertRaises(TypeError, test_me)
+
+    @testtools.skipIf(six.PY3, 'test specific to Python 2')
+    def test_str_disabled(self):
+        msgid = "A message"
+        test_me = lambda: str(_message.Message(msgid))
+        self.assertRaises(UnicodeError, test_me)
+
+    @mock.patch('gettext.translation')
+    def test_translate(self, mock_translation):
+        en_message = 'A message in the default locale'
+        es_translation = 'A message in Spanish'
+        message = _message.Message(en_message)
+
+        es_translations = {en_message: es_translation}
+        translations_map = {'es': es_translations}
+        translator = fakes.FakeTranslations.translator(translations_map)
+        mock_translation.side_effect = translator
+
+        self.assertEqual(es_translation, message.translate('es'))
+
+    @mock.patch('gettext.translation')
+    def test_translate_message_from_unicoded_object(self, mock_translation):
+        en_message = 'A message in the default locale'
+        es_translation = 'A message in Spanish'
+        message = _message.Message(en_message)
+        es_translations = {en_message: es_translation}
+        translations_map = {'es': es_translations}
+        translator = fakes.FakeTranslations.translator(translations_map)
+        mock_translation.side_effect = translator
+
+        # Here we are not testing the Message object directly but the result
+        # of unicoding() an object whose unicode representation is a Message
+        obj = utils.SomeObject(message)
+        unicoded_obj = six.text_type(obj)
+
+        self.assertEqual(es_translation, unicoded_obj.translate('es'))
+
+    @mock.patch('gettext.translation')
+    def test_translate_multiple_languages(self, mock_translation):
+        en_message = 'A message in the default locale'
+        es_translation = 'A message in Spanish'
+        zh_translation = 'A message in Chinese'
+        message = _message.Message(en_message)
+
+        es_translations = {en_message: es_translation}
+        zh_translations = {en_message: zh_translation}
+        translations_map = {'es': es_translations,
+                            'zh': zh_translations}
+        translator = fakes.FakeTranslations.translator(translations_map)
+        mock_translation.side_effect = translator
+
+        self.assertEqual(es_translation, message.translate('es'))
+        self.assertEqual(zh_translation, message.translate('zh'))
+        self.assertEqual(en_message, message.translate(None))
+        self.assertEqual(en_message, message.translate('en'))
+        self.assertEqual(en_message, message.translate('XX'))
+
+    @mock.patch('gettext.translation')
+    def test_translate_message_with_param(self, mock_translation):
+        message_with_params = 'A message: %s'
+        es_translation = 'A message in Spanish: %s'
+        param = 'A Message param'
+
+        translations = {message_with_params: es_translation}
+        translator = fakes.FakeTranslations.translator({'es': translations})
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(message_with_params)
+        msg = msg % param
+
+        default_translation = message_with_params % param
+        expected_translation = es_translation % param
+        self.assertEqual(expected_translation, msg.translate('es'))
+        self.assertEqual(default_translation, msg.translate('XX'))
+
+    @mock.patch('gettext.translation')
+    def test_translate_message_with_object_param(self, mock_translation):
+        message_with_params = 'A message: %s'
+        es_translation = 'A message in Spanish: %s'
+        param = 'A Message param'
+        param_translation = 'A Message param in Spanish'
+
+        translations = {message_with_params: es_translation,
+                        param: param_translation}
+        translator = fakes.FakeTranslations.translator({'es': translations})
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(message_with_params)
+        param_msg = _message.Message(param)
+
+        # Here we are testing translation of a Message with another object
+        # that can be translated via its unicode() representation, this is
+        # very common for instance when modding an Exception with a Message
+        obj = utils.SomeObject(param_msg)
+        msg = msg % obj
+
+        default_translation = message_with_params % param
+        expected_translation = es_translation % param_translation
+
+        self.assertEqual(expected_translation, msg.translate('es'))
+        self.assertEqual(default_translation, msg.translate('XX'))
+
+    @mock.patch('gettext.translation')
+    def test_translate_message_with_param_from_unicoded_obj(self,
+                                                            mock_translation):
+        message_with_params = 'A message: %s'
+        es_translation = 'A message in Spanish: %s'
+        param = 'A Message param'
+
+        translations = {message_with_params: es_translation}
+        translator = fakes.FakeTranslations.translator({'es': translations})
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(message_with_params)
+        msg = msg % param
+
+        default_translation = message_with_params % param
+        expected_translation = es_translation % param
+
+        obj = utils.SomeObject(msg)
+        unicoded_obj = six.text_type(obj)
+
+        self.assertEqual(expected_translation, unicoded_obj.translate('es'))
+        self.assertEqual(default_translation, unicoded_obj.translate('XX'))
+
+    @mock.patch('gettext.translation')
+    def test_translate_message_with_message_parameter(self, mock_translation):
+        message_with_params = 'A message with param: %s'
+        es_translation = 'A message with param in Spanish: %s'
+        message_param = 'A message param'
+        es_param_translation = 'A message param in Spanish'
+
+        translations = {message_with_params: es_translation,
+                        message_param: es_param_translation}
+        translator = fakes.FakeTranslations.translator({'es': translations})
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(message_with_params)
+        msg_param = _message.Message(message_param)
+        msg = msg % msg_param
+
+        default_translation = message_with_params % message_param
+        expected_translation = es_translation % es_param_translation
+        self.assertEqual(expected_translation, msg.translate('es'))
+        self.assertEqual(default_translation, msg.translate('XX'))
+
+    @mock.patch('gettext.translation')
+    def test_translate_message_with_message_parameters(self, mock_translation):
+        message_with_params = 'A message with params: %s %s'
+        es_translation = 'A message with params in Spanish: %s %s'
+        message_param = 'A message param'
+        es_param_translation = 'A message param in Spanish'
+        another_message_param = 'Another message param'
+        another_es_param_translation = 'Another message param in Spanish'
+
+        translations = {message_with_params: es_translation,
+                        message_param: es_param_translation,
+                        another_message_param: another_es_param_translation}
+        translator = fakes.FakeTranslations.translator({'es': translations})
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(message_with_params)
+        param_1 = _message.Message(message_param)
+        param_2 = _message.Message(another_message_param)
+        msg = msg % (param_1, param_2)
+
+        default_translation = message_with_params % (message_param,
+                                                     another_message_param)
+        expected_translation = es_translation % (es_param_translation,
+                                                 another_es_param_translation)
+        self.assertEqual(expected_translation, msg.translate('es'))
+        self.assertEqual(default_translation, msg.translate('XX'))
+
+    @mock.patch('gettext.translation')
+    def test_translate_message_with_named_parameters(self, mock_translation):
+        message_with_params = 'A message with params: %(param)s'
+        es_translation = 'A message with params in Spanish: %(param)s'
+        message_param = 'A Message param'
+        es_param_translation = 'A message param in Spanish'
+
+        translations = {message_with_params: es_translation,
+                        message_param: es_param_translation}
+        translator = fakes.FakeTranslations.translator({'es': translations})
+        mock_translation.side_effect = translator
+
+        msg = _message.Message(message_with_params)
+        msg_param = _message.Message(message_param)
+        msg = msg % {'param': msg_param}
+
+        default_translation = message_with_params % {'param': message_param}
+        expected_translation = es_translation % {'param': es_param_translation}
+        self.assertEqual(expected_translation, msg.translate('es'))
+        self.assertEqual(default_translation, msg.translate('XX'))
+
+    @mock.patch('locale.getdefaultlocale')
+    @mock.patch('gettext.translation')
+    def test_translate_message_non_default_locale(self,
+                                                  mock_translation,
+                                                  mock_getdefaultlocale):
+        message_with_params = 'A message with params: %(param)s'
+        es_translation = 'A message with params in Spanish: %(param)s'
+        zh_translation = 'A message with params in Chinese: %(param)s'
+        fr_translation = 'A message with params in French: %(param)s'
+
+        message_param = 'A Message param'
+        es_param_translation = 'A message param in Spanish'
+        zh_param_translation = 'A message param in Chinese'
+        fr_param_translation = 'A message param in French'
+
+        es_translations = {message_with_params: es_translation,
+                           message_param: es_param_translation}
+        zh_translations = {message_with_params: zh_translation,
+                           message_param: zh_param_translation}
+        fr_translations = {message_with_params: fr_translation,
+                           message_param: fr_param_translation}
+
+        translator = fakes.FakeTranslations.translator({'es': es_translations,
+                                                        'zh': zh_translations,
+                                                        'fr': fr_translations})
+        mock_translation.side_effect = translator
+        mock_getdefaultlocale.return_value = ('es',)
+
+        msg = _message.Message(message_with_params)
+        msg_param = _message.Message(message_param)
+        msg = msg % {'param': msg_param}
+
+        es_translation = es_translation % {'param': es_param_translation}
+        zh_translation = zh_translation % {'param': zh_param_translation}
+        fr_translation = fr_translation % {'param': fr_param_translation}
+
+        # Because sys.getdefaultlocale() was Spanish,
+        # the default translation will be to Spanish
+        self.assertEqual(es_translation, msg)
+        self.assertEqual(es_translation, msg.translate())
+        self.assertEqual(es_translation, msg.translate('es'))
+
+        # Translation into other locales still works
+        self.assertEqual(zh_translation, msg.translate('zh'))
+        self.assertEqual(fr_translation, msg.translate('fr'))
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_public_api.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_public_api.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_public_api.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_public_api.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,44 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+"""A few tests that use the public API to ensure the imports work.
+"""
+
+import unittest
+
+import mock
+
+import oslo_i18n
+from oslo_i18n import _lazy
+
+
+class PublicAPITest(unittest.TestCase):
+
+    def test_create_factory(self):
+        oslo_i18n.TranslatorFactory('domain')
+
+    def test_install(self):
+        with mock.patch('six.moves.builtins'):
+            oslo_i18n.install('domain')
+
+    def test_get_available_languages(self):
+        oslo_i18n.get_available_languages('domains')
+
+    def test_toggle_lazy(self):
+        original = _lazy.USE_LAZY
+        try:
+            oslo_i18n.enable_lazy(True)
+            oslo_i18n.enable_lazy(False)
+        finally:
+            oslo_i18n.enable_lazy(original)
+
+    def test_translate(self):
+        oslo_i18n.translate(u'string')
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/test_translate.py python-oslo.i18n-1.3.0/oslo_i18n/tests/test_translate.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/test_translate.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/test_translate.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,44 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from __future__ import unicode_literals
+
+import mock
+from oslotest import base as test_base
+
+from oslo_i18n import _message
+from oslo_i18n import _translate
+from oslo_i18n.tests import fakes
+from oslo_i18n.tests import utils
+
+
+class TranslateTest(test_base.BaseTestCase):
+
+    @mock.patch('gettext.translation')
+    def test_translate(self, mock_translation):
+        en_message = 'A message in the default locale'
+        es_translation = 'A message in Spanish'
+        message = _message.Message(en_message)
+
+        es_translations = {en_message: es_translation}
+        translations_map = {'es': es_translations}
+        translator = fakes.FakeTranslations.translator(translations_map)
+        mock_translation.side_effect = translator
+
+        # translate() works on msgs and on objects whose unicode reps are msgs
+        obj = utils.SomeObject(message)
+        self.assertEqual(es_translation, _translate.translate(message, 'es'))
+        self.assertEqual(es_translation, _translate.translate(obj, 'es'))
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/tests/utils.py python-oslo.i18n-1.3.0/oslo_i18n/tests/utils.py
--- python-oslo.i18n-1.1.0/oslo_i18n/tests/utils.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/tests/utils.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,42 @@
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import six
+
+
+class SomeObject(object):
+
+    def __init__(self, message):
+        self.message = message
+
+    def __unicode__(self):
+        return self.message
+    # alias for Python 3
+    __str__ = __unicode__
+
+
+class NoDeepCopyObject(object):
+
+    def __init__(self, value):
+        self.value = value
+
+    if six.PY3:
+        def __str__(self):
+            return str(self.value)
+    else:
+        def __unicode__(self):
+            return unicode(self.value)
+
+    def __deepcopy__(self, memo):
+        raise TypeError('Deep Copy not supported')
diff -Nru python-oslo.i18n-1.1.0/oslo_i18n/_translate.py python-oslo.i18n-1.3.0/oslo_i18n/_translate.py
--- python-oslo.i18n-1.1.0/oslo_i18n/_translate.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo_i18n/_translate.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,73 @@
+# Copyright 2012 Red Hat, Inc.
+# Copyright 2013 IBM Corp.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import six
+
+__all__ = [
+    'translate',
+]
+
+
+def translate(obj, desired_locale=None):
+    """Gets the translated unicode representation of the given object.
+
+    If the object is not translatable it is returned as-is.
+
+    If the desired_locale argument is None the object is translated to
+    the system locale.
+
+    :param obj: the object to translate
+    :param desired_locale: the locale to translate the message to, if None the
+                           default system locale will be used
+    :returns: the translated object in unicode, or the original object if
+              it could not be translated
+
+    """
+    from oslo_i18n import _message  # avoid circular dependency at module level
+    message = obj
+    if not isinstance(message, _message.Message):
+        # If the object to translate is not already translatable,
+        # let's first get its unicode representation
+        message = six.text_type(obj)
+    if isinstance(message, _message.Message):
+        # Even after unicoding() we still need to check if we are
+        # running with translatable unicode before translating
+        return message.translate(desired_locale)
+    return obj
+
+
+def translate_args(args, desired_locale=None):
+    """Translates all the translatable elements of the given arguments object.
+
+    This method is used for translating the translatable values in method
+    arguments which include values of tuples or dictionaries.
+    If the object is not a tuple or a dictionary the object itself is
+    translated if it is translatable.
+
+    If the locale is None the object is translated to the system locale.
+
+    :param args: the args to translate
+    :param desired_locale: the locale to translate the args to, if None the
+                           default system locale will be used
+    :returns: a new args object with the translated contents of the original
+    """
+    if isinstance(args, tuple):
+        return tuple(translate(v, desired_locale) for v in args)
+    if isinstance(args, dict):
+        translated_dict = dict((key, translate(value, desired_locale))
+                               for key, value in six.iteritems(args))
+        return translated_dict
+    return translate(args, desired_locale)
diff -Nru python-oslo.i18n-1.1.0/oslo.i18n.egg-info/pbr.json python-oslo.i18n-1.3.0/oslo.i18n.egg-info/pbr.json
--- python-oslo.i18n-1.1.0/oslo.i18n.egg-info/pbr.json	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo.i18n.egg-info/pbr.json	2015-01-08 14:46:33.000000000 -0500
@@ -0,0 +1 @@
+{"git_version": "118aeb0", "is_release": true}
\ No newline at end of file
diff -Nru python-oslo.i18n-1.1.0/oslo.i18n.egg-info/PKG-INFO python-oslo.i18n-1.3.0/oslo.i18n.egg-info/PKG-INFO
--- python-oslo.i18n-1.1.0/oslo.i18n.egg-info/PKG-INFO	2014-12-02 10:23:28.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo.i18n.egg-info/PKG-INFO	2015-01-08 14:46:33.000000000 -0500
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: oslo.i18n
-Version: 1.1.0
+Version: 1.3.0
 Summary: oslo.i18n library
 Home-page: http://launchpad.net/oslo
 Author: OpenStack
@@ -17,7 +17,7 @@
         * Free software: Apache license
         * Documentation: http://docs.openstack.org/developer/oslo.i18n
         * Source: http://git.openstack.org/cgit/openstack/oslo.i18n
-        * Bugs: http://bugs.launchpad.net/oslo
+        * Bugs: http://bugs.launchpad.net/oslo.i18n
         
         
 Platform: UNKNOWN
diff -Nru python-oslo.i18n-1.1.0/oslo.i18n.egg-info/requires.txt python-oslo.i18n-1.3.0/oslo.i18n.egg-info/requires.txt
--- python-oslo.i18n-1.1.0/oslo.i18n.egg-info/requires.txt	2014-12-02 10:23:28.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo.i18n.egg-info/requires.txt	2015-01-08 14:46:33.000000000 -0500
@@ -1,3 +1,3 @@
 pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
-six>=1.7.0
\ No newline at end of file
+six>=1.7.0
diff -Nru python-oslo.i18n-1.1.0/oslo.i18n.egg-info/SOURCES.txt python-oslo.i18n-1.3.0/oslo.i18n.egg-info/SOURCES.txt
--- python-oslo.i18n-1.1.0/oslo.i18n.egg-info/SOURCES.txt	2014-12-02 10:23:29.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo.i18n.egg-info/SOURCES.txt	2015-01-08 14:46:33.000000000 -0500
@@ -29,6 +29,7 @@
 oslo.i18n.egg-info/dependency_links.txt
 oslo.i18n.egg-info/namespace_packages.txt
 oslo.i18n.egg-info/not-zip-safe
+oslo.i18n.egg-info/pbr.json
 oslo.i18n.egg-info/requires.txt
 oslo.i18n.egg-info/top_level.txt
 oslo.i18n/locale/oslo.i18n-log-critical.pot
@@ -44,26 +45,34 @@
 oslo.i18n/locale/pl_PL/LC_MESSAGES/oslo.i18n.po
 oslo.i18n/locale/zh_CN/LC_MESSAGES/oslo.i18n.po
 oslo/i18n/__init__.py
-oslo/i18n/_factory.py
-oslo/i18n/_gettextutils.py
-oslo/i18n/_i18n.py
-oslo/i18n/_lazy.py
-oslo/i18n/_locale.py
-oslo/i18n/_message.py
-oslo/i18n/_translate.py
 oslo/i18n/fixture.py
 oslo/i18n/log.py
+oslo_i18n/__init__.py
+oslo_i18n/_factory.py
+oslo_i18n/_gettextutils.py
+oslo_i18n/_i18n.py
+oslo_i18n/_lazy.py
+oslo_i18n/_locale.py
+oslo_i18n/_message.py
+oslo_i18n/_translate.py
+oslo_i18n/fixture.py
+oslo_i18n/log.py
+oslo_i18n/tests/__init__.py
+oslo_i18n/tests/fakes.py
+oslo_i18n/tests/test_factory.py
+oslo_i18n/tests/test_fixture.py
+oslo_i18n/tests/test_gettextutils.py
+oslo_i18n/tests/test_handler.py
+oslo_i18n/tests/test_lazy.py
+oslo_i18n/tests/test_locale_dir_variable.py
+oslo_i18n/tests/test_logging.py
+oslo_i18n/tests/test_message.py
+oslo_i18n/tests/test_public_api.py
+oslo_i18n/tests/test_translate.py
+oslo_i18n/tests/utils.py
 tests/__init__.py
-tests/fakes.py
-tests/test_factory.py
 tests/test_fixture.py
-tests/test_gettextutils.py
 tests/test_handler.py
-tests/test_lazy.py
-tests/test_locale_dir_variable.py
-tests/test_logging.py
-tests/test_message.py
 tests/test_public_api.py
-tests/test_translate.py
-tests/utils.py
+tests/test_warning.py
 tools/run_cross_tests.sh
\ No newline at end of file
diff -Nru python-oslo.i18n-1.1.0/oslo.i18n.egg-info/top_level.txt python-oslo.i18n-1.3.0/oslo.i18n.egg-info/top_level.txt
--- python-oslo.i18n-1.1.0/oslo.i18n.egg-info/top_level.txt	2014-12-02 10:23:28.000000000 -0500
+++ python-oslo.i18n-1.3.0/oslo.i18n.egg-info/top_level.txt	2015-01-08 14:46:33.000000000 -0500
@@ -1 +1,2 @@
 oslo
+oslo_i18n
diff -Nru python-oslo.i18n-1.1.0/PKG-INFO python-oslo.i18n-1.3.0/PKG-INFO
--- python-oslo.i18n-1.1.0/PKG-INFO	2014-12-02 10:23:29.000000000 -0500
+++ python-oslo.i18n-1.3.0/PKG-INFO	2015-01-08 14:46:33.000000000 -0500
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: oslo.i18n
-Version: 1.1.0
+Version: 1.3.0
 Summary: oslo.i18n library
 Home-page: http://launchpad.net/oslo
 Author: OpenStack
@@ -17,7 +17,7 @@
         * Free software: Apache license
         * Documentation: http://docs.openstack.org/developer/oslo.i18n
         * Source: http://git.openstack.org/cgit/openstack/oslo.i18n
-        * Bugs: http://bugs.launchpad.net/oslo
+        * Bugs: http://bugs.launchpad.net/oslo.i18n
         
         
 Platform: UNKNOWN
diff -Nru python-oslo.i18n-1.1.0/README.rst python-oslo.i18n-1.3.0/README.rst
--- python-oslo.i18n-1.1.0/README.rst	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/README.rst	2015-01-08 14:46:13.000000000 -0500
@@ -9,4 +9,4 @@
 * Free software: Apache license
 * Documentation: http://docs.openstack.org/developer/oslo.i18n
 * Source: http://git.openstack.org/cgit/openstack/oslo.i18n
-* Bugs: http://bugs.launchpad.net/oslo
+* Bugs: http://bugs.launchpad.net/oslo.i18n
diff -Nru python-oslo.i18n-1.1.0/setup.cfg python-oslo.i18n-1.3.0/setup.cfg
--- python-oslo.i18n-1.1.0/setup.cfg	2014-12-02 10:23:29.000000000 -0500
+++ python-oslo.i18n-1.3.0/setup.cfg	2015-01-08 14:46:33.000000000 -0500
@@ -22,7 +22,7 @@
 [files]
 packages = 
 	oslo
-	oslo.i18n
+	oslo_i18n
 namespace_packages = 
 	oslo
 
@@ -55,7 +55,7 @@
 universal = 1
 
 [egg_info]
+tag_svn_revision = 0
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff -Nru python-oslo.i18n-1.1.0/tests/fakes.py python-oslo.i18n-1.3.0/tests/fakes.py
--- python-oslo.i18n-1.1.0/tests/fakes.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/fakes.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,59 +0,0 @@
-# Copyright 2012 Intel Inc, OpenStack Foundation.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-Fakes For translation tests.
-"""
-
-import gettext
-
-
-class FakeTranslations(gettext.GNUTranslations):
-    """A test GNUTranslations class that takes a map of msg -> translations."""
-
-    def __init__(self, translations):
-        self.translations = translations
-
-    # used by Python 3
-    def gettext(self, msgid):
-        return self.translations.get(msgid, msgid)
-
-    # used by Python 2
-    def ugettext(self, msgid):
-        return self.translations.get(msgid, msgid)
-
-    @staticmethod
-    def translator(locales_map):
-        """Build mock translator for the given locales.
-
-        Returns a mock gettext.translation function that uses
-        individual TestTranslations to translate in the given locales.
-
-        :param locales_map: A map from locale name to a translations map.
-                            {
-                             'es': {'Hi': 'Hola', 'Bye': 'Adios'},
-                             'zh': {'Hi': 'Ni Hao', 'Bye': 'Zaijian'}
-                            }
-
-
-        """
-        def _translation(domain, localedir=None,
-                         languages=None, fallback=None):
-            if languages:
-                language = languages[0]
-                if language in locales_map:
-                    return FakeTranslations(locales_map[language])
-            return gettext.NullTranslations()
-        return _translation
diff -Nru python-oslo.i18n-1.1.0/tests/test_factory.py python-oslo.i18n-1.3.0/tests/test_factory.py
--- python-oslo.i18n-1.1.0/tests/test_factory.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_factory.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,91 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import mock
-from oslotest import base as test_base
-import six
-
-from oslo.i18n import _factory
-from oslo.i18n import _lazy
-from oslo.i18n import _message
-
-
-class TranslatorFactoryTest(test_base.BaseTestCase):
-
-    def setUp(self):
-        super(TranslatorFactoryTest, self).setUp()
-        # remember so we can reset to it later in case it changes
-        self._USE_LAZY = _lazy.USE_LAZY
-
-    def tearDown(self):
-        # reset to value before test
-        _lazy.USE_LAZY = self._USE_LAZY
-        super(TranslatorFactoryTest, self).tearDown()
-
-    def test_lazy(self):
-        _lazy.enable_lazy(True)
-        with mock.patch.object(_message, 'Message') as msg:
-            tf = _factory.TranslatorFactory('domain')
-            tf.primary('some text')
-            msg.assert_called_with('some text', domain='domain')
-
-    def test_not_lazy(self):
-        _lazy.enable_lazy(False)
-        with mock.patch.object(_message, 'Message') as msg:
-            msg.side_effect = AssertionError('should not use Message')
-            tf = _factory.TranslatorFactory('domain')
-            tf.primary('some text')
-
-    def test_change_lazy(self):
-        _lazy.enable_lazy(True)
-        tf = _factory.TranslatorFactory('domain')
-        r = tf.primary('some text')
-        self.assertIsInstance(r, _message.Message)
-        _lazy.enable_lazy(False)
-        r = tf.primary('some text')
-        # Python 2.6 doesn't have assertNotIsInstance().
-        self.assertFalse(isinstance(r, _message.Message))
-
-    def test_py2(self):
-        _lazy.enable_lazy(False)
-        with mock.patch.object(six, 'PY3', False):
-            with mock.patch('gettext.translation') as translation:
-                trans = mock.Mock()
-                translation.return_value = trans
-                trans.gettext.side_effect = AssertionError(
-                    'should have called ugettext')
-                tf = _factory.TranslatorFactory('domain')
-                tf.primary('some text')
-                trans.ugettext.assert_called_with('some text')
-
-    def test_py3(self):
-        _lazy.enable_lazy(False)
-        with mock.patch.object(six, 'PY3', True):
-            with mock.patch('gettext.translation') as translation:
-                trans = mock.Mock()
-                translation.return_value = trans
-                trans.ugettext.side_effect = AssertionError(
-                    'should have called gettext')
-                tf = _factory.TranslatorFactory('domain')
-                tf.primary('some text')
-                trans.gettext.assert_called_with('some text')
-
-    def test_log_level_domain_name(self):
-        with mock.patch.object(_factory.TranslatorFactory,
-                               '_make_translation_func') as mtf:
-            tf = _factory.TranslatorFactory('domain')
-            tf._make_log_translation_func('mylevel')
-            mtf.assert_called_with('domain-log-mylevel')
diff -Nru python-oslo.i18n-1.1.0/tests/test_fixture.py python-oslo.i18n-1.3.0/tests/test_fixture.py
--- python-oslo.i18n-1.1.0/tests/test_fixture.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_fixture.py	2015-01-08 14:46:13.000000000 -0500
@@ -15,8 +15,8 @@
 from oslotest import base as test_base
 import six
 
-from oslo.i18n import _message
 from oslo.i18n import fixture
+from oslo_i18n import _message
 
 
 class FixtureTest(test_base.BaseTestCase):
diff -Nru python-oslo.i18n-1.1.0/tests/test_gettextutils.py python-oslo.i18n-1.3.0/tests/test_gettextutils.py
--- python-oslo.i18n-1.1.0/tests/test_gettextutils.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_gettextutils.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,128 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import gettext
-import logging
-
-from babel import localedata
-import mock
-from oslotest import base as test_base
-from oslotest import moxstubout
-import six
-
-from oslo.i18n import _factory
-from oslo.i18n import _gettextutils
-from oslo.i18n import _lazy
-from oslo.i18n import _message
-
-
-LOG = logging.getLogger(__name__)
-
-
-class GettextTest(test_base.BaseTestCase):
-
-    def setUp(self):
-        super(GettextTest, self).setUp()
-        moxfixture = self.useFixture(moxstubout.MoxStubout())
-        self.stubs = moxfixture.stubs
-        self.mox = moxfixture.mox
-        # remember so we can reset to it later in case it changes
-        self._USE_LAZY = _lazy.USE_LAZY
-        self.t = _factory.TranslatorFactory('oslo.i18n.test')
-
-    def tearDown(self):
-        # reset to value before test
-        _lazy.USE_LAZY = self._USE_LAZY
-        super(GettextTest, self).tearDown()
-
-    def test_gettext_does_not_blow_up(self):
-        LOG.info(self.t.primary('test'))
-
-    def test__gettextutils_install(self):
-        _gettextutils.install('blaa')
-        _lazy.enable_lazy(False)
-        self.assertTrue(isinstance(self.t.primary('A String'),
-                                   six.text_type))
-
-        _gettextutils.install('blaa')
-        _lazy.enable_lazy(True)
-        self.assertTrue(isinstance(self.t.primary('A Message'),
-                                   _message.Message))
-
-    def test_gettext_install_looks_up_localedir(self):
-        with mock.patch('os.environ.get') as environ_get:
-            with mock.patch('gettext.install'):
-                environ_get.return_value = '/foo/bar'
-                _gettextutils.install('blaa')
-                environ_get.assert_calls([mock.call('BLAA_LOCALEDIR')])
-
-    def test_gettext_install_updates_builtins(self):
-        with mock.patch('os.environ.get') as environ_get:
-            with mock.patch('gettext.install'):
-                environ_get.return_value = '/foo/bar'
-                if '_' in six.moves.builtins.__dict__:
-                    del six.moves.builtins.__dict__['_']
-                _gettextutils.install('blaa')
-                self.assertIn('_', six.moves.builtins.__dict__)
-
-    def test_get_available_languages(self):
-        # All the available languages for which locale data is available
-        def _mock_locale_identifiers():
-            # 'zh', 'zh_Hant'. 'zh_Hant_HK', 'fil' all have aliases
-            # missing from babel but we add them in _gettextutils, we
-            # test that here too
-            return ['zh', 'es', 'nl', 'fr', 'zh_Hant', 'zh_Hant_HK', 'fil']
-
-        self.stubs.Set(localedata,
-                       'list' if hasattr(localedata, 'list')
-                       else 'locale_identifiers',
-                       _mock_locale_identifiers)
-
-        # Only the languages available for a specific translation domain
-        def _mock_gettext_find(domain, localedir=None, languages=None, all=0):
-            languages = languages or []
-            if domain == 'domain_1':
-                return 'translation-file' if any(x in ['zh', 'es', 'fil']
-                                                 for x in languages) else None
-            elif domain == 'domain_2':
-                return 'translation-file' if any(x in ['fr', 'zh_Hant']
-                                                 for x in languages) else None
-            return None
-        self.stubs.Set(gettext, 'find', _mock_gettext_find)
-
-        # en_US should always be available no matter the domain
-        # and it should also always be the first element since order matters
-        domain_1_languages = _gettextutils.get_available_languages('domain_1')
-        domain_2_languages = _gettextutils.get_available_languages('domain_2')
-        self.assertEqual('en_US', domain_1_languages[0])
-        self.assertEqual('en_US', domain_2_languages[0])
-        # The domain languages should be included after en_US with
-        # with their respective aliases when it applies
-        self.assertEqual(6, len(domain_1_languages))
-        self.assertIn('zh', domain_1_languages)
-        self.assertIn('zh_CN', domain_1_languages)
-        self.assertIn('es', domain_1_languages)
-        self.assertIn('fil', domain_1_languages)
-        self.assertIn('tl_PH', domain_1_languages)
-        self.assertEqual(4, len(domain_2_languages))
-        self.assertIn('fr', domain_2_languages)
-        self.assertIn('zh_Hant', domain_2_languages)
-        self.assertIn('zh_TW', domain_2_languages)
-        self.assertEqual(2, len(_gettextutils._AVAILABLE_LANGUAGES))
-        # Now test an unknown domain, only en_US should be included
-        unknown_domain_languages = _gettextutils.get_available_languages('huh')
-        self.assertEqual(1, len(unknown_domain_languages))
-        self.assertIn('en_US', unknown_domain_languages)
diff -Nru python-oslo.i18n-1.1.0/tests/test_handler.py python-oslo.i18n-1.3.0/tests/test_handler.py
--- python-oslo.i18n-1.1.0/tests/test_handler.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_handler.py	2015-01-08 14:46:13.000000000 -0500
@@ -20,9 +20,9 @@
 from oslotest import base as test_base
 import six
 
-from oslo.i18n import _message
 from oslo.i18n import log as i18n_log
-from tests import fakes
+from oslo_i18n import _message
+from oslo_i18n.tests import fakes
 
 LOG = logging.getLogger(__name__)
 
diff -Nru python-oslo.i18n-1.1.0/tests/test_lazy.py python-oslo.i18n-1.3.0/tests/test_lazy.py
--- python-oslo.i18n-1.1.0/tests/test_lazy.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_lazy.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,40 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslotest import base as test_base
-
-from oslo.i18n import _lazy
-
-
-class LazyTest(test_base.BaseTestCase):
-
-    def setUp(self):
-        super(LazyTest, self).setUp()
-        self._USE_LAZY = _lazy.USE_LAZY
-
-    def tearDown(self):
-        _lazy.USE_LAZY = self._USE_LAZY
-        super(LazyTest, self).tearDown()
-
-    def test_enable_lazy(self):
-        _lazy.USE_LAZY = False
-        _lazy.enable_lazy()
-        self.assertTrue(_lazy.USE_LAZY)
-
-    def test_disable_lazy(self):
-        _lazy.USE_LAZY = True
-        _lazy.enable_lazy(False)
-        self.assertFalse(_lazy.USE_LAZY)
diff -Nru python-oslo.i18n-1.1.0/tests/test_locale_dir_variable.py python-oslo.i18n-1.3.0/tests/test_locale_dir_variable.py
--- python-oslo.i18n-1.1.0/tests/test_locale_dir_variable.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_locale_dir_variable.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,32 +0,0 @@
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslotest import base as test_base
-import testscenarios.testcase
-
-from oslo.i18n import _locale
-
-
-class LocaleDirVariableTest(testscenarios.testcase.WithScenarios,
-                            test_base.BaseTestCase):
-
-    scenarios = [
-        ('simple', {'domain': 'simple', 'expected': 'SIMPLE_LOCALEDIR'}),
-        ('with_dot', {'domain': 'one.two', 'expected': 'ONE_TWO_LOCALEDIR'}),
-        ('with_dash', {'domain': 'one-two', 'expected': 'ONE_TWO_LOCALEDIR'}),
-    ]
-
-    def test_make_variable_name(self):
-        var = _locale.get_locale_dir_variable_name(self.domain)
-        self.assertEqual(self.expected, var)
diff -Nru python-oslo.i18n-1.1.0/tests/test_logging.py python-oslo.i18n-1.3.0/tests/test_logging.py
--- python-oslo.i18n-1.1.0/tests/test_logging.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_logging.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,42 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import mock
-from oslotest import base as test_base
-
-from oslo.i18n import _factory
-
-
-class LogLevelTranslationsTest(test_base.BaseTestCase):
-
-    def test_info(self):
-        self._test('info')
-
-    def test_warning(self):
-        self._test('warning')
-
-    def test_error(self):
-        self._test('error')
-
-    def test_critical(self):
-        self._test('critical')
-
-    def _test(self, level):
-        with mock.patch.object(_factory.TranslatorFactory,
-                               '_make_translation_func') as mtf:
-            tf = _factory.TranslatorFactory('domain')
-            getattr(tf, 'log_%s' % level)
-            mtf.assert_called_with('domain-log-%s' % level)
diff -Nru python-oslo.i18n-1.1.0/tests/test_message.py python-oslo.i18n-1.3.0/tests/test_message.py
--- python-oslo.i18n-1.1.0/tests/test_message.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_message.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,518 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from __future__ import unicode_literals
-
-import logging
-
-import mock
-from oslotest import base as test_base
-import six
-import testtools
-
-from oslo.i18n import _message
-from tests import fakes
-from tests import utils
-
-LOG = logging.getLogger(__name__)
-
-
-class MessageTestCase(test_base.BaseTestCase):
-    """Unit tests for locale Message class."""
-
-    def test_message_id_and_message_text(self):
-        message = _message.Message('1')
-        self.assertEqual('1', message.msgid)
-        self.assertEqual('1', message)
-        message = _message.Message('1', msgtext='A')
-        self.assertEqual('1', message.msgid)
-        self.assertEqual('A', message)
-
-    def test_message_is_unicode(self):
-        message = _message.Message('some %s') % 'message'
-        self.assertIsInstance(message, six.text_type)
-
-    @mock.patch('locale.getdefaultlocale')
-    @mock.patch('gettext.translation')
-    def test_create_message_non_english_default_locale(self,
-                                                       mock_translation,
-                                                       mock_getdefaultlocale):
-        msgid = 'A message in English'
-        es_translation = 'A message in Spanish'
-
-        es_translations = {msgid: es_translation}
-        translations_map = {'es': es_translations}
-        translator = fakes.FakeTranslations.translator(translations_map)
-        mock_translation.side_effect = translator
-        mock_getdefaultlocale.return_value = ('es',)
-
-        message = _message.Message(msgid)
-
-        # The base representation of the message is in Spanish, as well as
-        # the default translation, since the default locale was Spanish.
-        self.assertEqual(es_translation, message)
-        self.assertEqual(es_translation, message.translate())
-
-    def test_translate_returns_unicode(self):
-        message = _message.Message('some %s') % 'message'
-        self.assertIsInstance(message.translate(), six.text_type)
-
-    def test_mod_with_named_parameters(self):
-        msgid = ("%(description)s\nCommand: %(cmd)s\n"
-                 "Exit code: %(exit_code)s\nStdout: %(stdout)r\n"
-                 "Stderr: %(stderr)r %%(something)s")
-        params = {'description': 'test1',
-                  'cmd': 'test2',
-                  'exit_code': 'test3',
-                  'stdout': 'test4',
-                  'stderr': 'test5',
-                  'something': 'trimmed'}
-
-        result = _message.Message(msgid) % params
-
-        expected = msgid % params
-        self.assertEqual(result, expected)
-        self.assertEqual(result.translate(), expected)
-
-    def test_multiple_mod_with_named_parameter(self):
-        msgid = ("%(description)s\nCommand: %(cmd)s\n"
-                 "Exit code: %(exit_code)s\nStdout: %(stdout)r\n"
-                 "Stderr: %(stderr)r")
-        params = {'description': 'test1',
-                  'cmd': 'test2',
-                  'exit_code': 'test3',
-                  'stdout': 'test4',
-                  'stderr': 'test5'}
-
-        # Run string interpolation the first time to make a new Message
-        first = _message.Message(msgid) % params
-
-        # Run string interpolation on the new Message, to replicate
-        # one of the error paths with some Exception classes we've
-        # implemented in OpenStack. We should receive a second Message
-        # object, but the translation results should be the same.
-        #
-        # The production code that triggers this problem does something
-        # like:
-        #
-        #    msg = _('there was a problem %(name)s') % {'name': 'some value'}
-        #    LOG.error(msg)
-        #    raise BadExceptionClass(msg)
-        #
-        # where BadExceptionClass does something like:
-        #
-        #    class BadExceptionClass(Exception):
-        #      def __init__(self, msg, **kwds):
-        #         super(BadExceptionClass, self).__init__(msg % kwds)
-        #
-        expected = first % {}
-
-        # Base message id should be the same
-        self.assertEqual(first.msgid, expected.msgid)
-
-        # Preserved arguments should be the same
-        self.assertEqual(first.params, expected.params)
-
-        # Should have different objects
-        self.assertIsNot(expected, first)
-
-        # Final translations should be the same
-        self.assertEqual(expected.translate(), first.translate())
-
-    def test_mod_with_named_parameters_no_space(self):
-        msgid = ("Request: %(method)s http://%(server)s:"
-                 "%(port)s%(url)s with headers %(headers)s")
-        params = {'method': 'POST',
-                  'server': 'test1',
-                  'port': 1234,
-                  'url': 'test2',
-                  'headers': {'h1': 'val1'}}
-
-        result = _message.Message(msgid) % params
-
-        expected = msgid % params
-        self.assertEqual(result, expected)
-        self.assertEqual(result.translate(), expected)
-
-    def test_mod_with_dict_parameter(self):
-        msgid = "Test that we can inject a dictionary %s"
-        params = {'description': 'test1'}
-
-        result = _message.Message(msgid) % params
-
-        expected = msgid % params
-        self.assertEqual(expected, result)
-        self.assertEqual(expected, result.translate())
-
-    def test_mod_with_integer_parameters(self):
-        msgid = "Some string with params: %d"
-        params = [0, 1, 10, 24124]
-
-        messages = []
-        results = []
-        for param in params:
-            messages.append(msgid % param)
-            results.append(_message.Message(msgid) % param)
-
-        for message, result in zip(messages, results):
-            self.assertEqual(type(result), _message.Message)
-            self.assertEqual(result.translate(), message)
-
-            # simulate writing out as string
-            result_str = '%s' % result.translate()
-            self.assertEqual(result_str, message)
-            self.assertEqual(result, message)
-
-    def test_mod_copies_parameters(self):
-        msgid = "Found object: %(current_value)s"
-        changing_dict = {'current_value': 1}
-        # A message created with some params
-        result = _message.Message(msgid) % changing_dict
-        # The parameters may change
-        changing_dict['current_value'] = 2
-        # Even if the param changes when the message is
-        # translated it should use the original param
-        self.assertEqual(result.translate(), 'Found object: 1')
-
-    def test_mod_deep_copies_parameters(self):
-        msgid = "Found list: %(current_list)s"
-        changing_list = list([1, 2, 3])
-        params = {'current_list': changing_list}
-        # Apply the params
-        result = _message.Message(msgid) % params
-        # Change the list
-        changing_list.append(4)
-        # Even though the list changed the message
-        # translation should use the original list
-        self.assertEqual(result.translate(), "Found list: [1, 2, 3]")
-
-    def test_mod_deep_copies_param_nodeep_param(self):
-        msgid = "Value: %s"
-        params = utils.NoDeepCopyObject(5)
-        # Apply the params
-        result = _message.Message(msgid) % params
-        self.assertEqual(result.translate(), "Value: 5")
-
-    def test_mod_deep_copies_param_nodeep_dict(self):
-        msgid = "Values: %(val1)s %(val2)s"
-        params = {'val1': 1, 'val2': utils.NoDeepCopyObject(2)}
-        # Apply the params
-        result = _message.Message(msgid) % params
-        self.assertEqual(result.translate(), "Values: 1 2")
-
-        # Apply again to make sure other path works as well
-        params = {'val1': 3, 'val2': utils.NoDeepCopyObject(4)}
-        result = _message.Message(msgid) % params
-        self.assertEqual(result.translate(), "Values: 3 4")
-
-    def test_mod_returns_a_copy(self):
-        msgid = "Some msgid string: %(test1)s %(test2)s"
-        message = _message.Message(msgid)
-        m1 = message % {'test1': 'foo', 'test2': 'bar'}
-        m2 = message % {'test1': 'foo2', 'test2': 'bar2'}
-
-        self.assertIsNot(message, m1)
-        self.assertIsNot(message, m2)
-        self.assertEqual(m1.translate(),
-                         msgid % {'test1': 'foo', 'test2': 'bar'})
-        self.assertEqual(m2.translate(),
-                         msgid % {'test1': 'foo2', 'test2': 'bar2'})
-
-    def test_mod_with_none_parameter(self):
-        msgid = "Some string with params: %s"
-        message = _message.Message(msgid) % None
-        self.assertEqual(msgid % None, message)
-        self.assertEqual(msgid % None, message.translate())
-
-    def test_mod_with_missing_parameters(self):
-        msgid = "Some string with params: %s %s"
-        test_me = lambda: _message.Message(msgid) % 'just one'
-        # Just like with strings missing parameters raise TypeError
-        self.assertRaises(TypeError, test_me)
-
-    def test_mod_with_extra_parameters(self):
-        msgid = "Some string with params: %(param1)s %(param2)s"
-        params = {'param1': 'test',
-                  'param2': 'test2',
-                  'param3': 'notinstring'}
-
-        result = _message.Message(msgid) % params
-
-        expected = msgid % params
-        self.assertEqual(result, expected)
-        self.assertEqual(result.translate(), expected)
-
-        # Make sure unused params still there
-        self.assertEqual(result.params.keys(), params.keys())
-
-    def test_mod_with_missing_named_parameters(self):
-        msgid = ("Some string with params: %(param1)s %(param2)s"
-                 " and a missing one %(missing)s")
-        params = {'param1': 'test',
-                  'param2': 'test2'}
-
-        test_me = lambda: _message.Message(msgid) % params
-        # Just like with strings missing named parameters raise KeyError
-        self.assertRaises(KeyError, test_me)
-
-    def test_add_disabled(self):
-        msgid = "A message"
-        test_me = lambda: _message.Message(msgid) + ' some string'
-        self.assertRaises(TypeError, test_me)
-
-    def test_radd_disabled(self):
-        msgid = "A message"
-        test_me = lambda: utils.SomeObject('test') + _message.Message(msgid)
-        self.assertRaises(TypeError, test_me)
-
-    @testtools.skipIf(six.PY3, 'test specific to Python 2')
-    def test_str_disabled(self):
-        msgid = "A message"
-        test_me = lambda: str(_message.Message(msgid))
-        self.assertRaises(UnicodeError, test_me)
-
-    @mock.patch('gettext.translation')
-    def test_translate(self, mock_translation):
-        en_message = 'A message in the default locale'
-        es_translation = 'A message in Spanish'
-        message = _message.Message(en_message)
-
-        es_translations = {en_message: es_translation}
-        translations_map = {'es': es_translations}
-        translator = fakes.FakeTranslations.translator(translations_map)
-        mock_translation.side_effect = translator
-
-        self.assertEqual(es_translation, message.translate('es'))
-
-    @mock.patch('gettext.translation')
-    def test_translate_message_from_unicoded_object(self, mock_translation):
-        en_message = 'A message in the default locale'
-        es_translation = 'A message in Spanish'
-        message = _message.Message(en_message)
-        es_translations = {en_message: es_translation}
-        translations_map = {'es': es_translations}
-        translator = fakes.FakeTranslations.translator(translations_map)
-        mock_translation.side_effect = translator
-
-        # Here we are not testing the Message object directly but the result
-        # of unicoding() an object whose unicode representation is a Message
-        obj = utils.SomeObject(message)
-        unicoded_obj = six.text_type(obj)
-
-        self.assertEqual(es_translation, unicoded_obj.translate('es'))
-
-    @mock.patch('gettext.translation')
-    def test_translate_multiple_languages(self, mock_translation):
-        en_message = 'A message in the default locale'
-        es_translation = 'A message in Spanish'
-        zh_translation = 'A message in Chinese'
-        message = _message.Message(en_message)
-
-        es_translations = {en_message: es_translation}
-        zh_translations = {en_message: zh_translation}
-        translations_map = {'es': es_translations,
-                            'zh': zh_translations}
-        translator = fakes.FakeTranslations.translator(translations_map)
-        mock_translation.side_effect = translator
-
-        self.assertEqual(es_translation, message.translate('es'))
-        self.assertEqual(zh_translation, message.translate('zh'))
-        self.assertEqual(en_message, message.translate(None))
-        self.assertEqual(en_message, message.translate('en'))
-        self.assertEqual(en_message, message.translate('XX'))
-
-    @mock.patch('gettext.translation')
-    def test_translate_message_with_param(self, mock_translation):
-        message_with_params = 'A message: %s'
-        es_translation = 'A message in Spanish: %s'
-        param = 'A Message param'
-
-        translations = {message_with_params: es_translation}
-        translator = fakes.FakeTranslations.translator({'es': translations})
-        mock_translation.side_effect = translator
-
-        msg = _message.Message(message_with_params)
-        msg = msg % param
-
-        default_translation = message_with_params % param
-        expected_translation = es_translation % param
-        self.assertEqual(expected_translation, msg.translate('es'))
-        self.assertEqual(default_translation, msg.translate('XX'))
-
-    @mock.patch('gettext.translation')
-    def test_translate_message_with_object_param(self, mock_translation):
-        message_with_params = 'A message: %s'
-        es_translation = 'A message in Spanish: %s'
-        param = 'A Message param'
-        param_translation = 'A Message param in Spanish'
-
-        translations = {message_with_params: es_translation,
-                        param: param_translation}
-        translator = fakes.FakeTranslations.translator({'es': translations})
-        mock_translation.side_effect = translator
-
-        msg = _message.Message(message_with_params)
-        param_msg = _message.Message(param)
-
-        # Here we are testing translation of a Message with another object
-        # that can be translated via its unicode() representation, this is
-        # very common for instance when modding an Exception with a Message
-        obj = utils.SomeObject(param_msg)
-        msg = msg % obj
-
-        default_translation = message_with_params % param
-        expected_translation = es_translation % param_translation
-
-        self.assertEqual(expected_translation, msg.translate('es'))
-        self.assertEqual(default_translation, msg.translate('XX'))
-
-    @mock.patch('gettext.translation')
-    def test_translate_message_with_param_from_unicoded_obj(self,
-                                                            mock_translation):
-        message_with_params = 'A message: %s'
-        es_translation = 'A message in Spanish: %s'
-        param = 'A Message param'
-
-        translations = {message_with_params: es_translation}
-        translator = fakes.FakeTranslations.translator({'es': translations})
-        mock_translation.side_effect = translator
-
-        msg = _message.Message(message_with_params)
-        msg = msg % param
-
-        default_translation = message_with_params % param
-        expected_translation = es_translation % param
-
-        obj = utils.SomeObject(msg)
-        unicoded_obj = six.text_type(obj)
-
-        self.assertEqual(expected_translation, unicoded_obj.translate('es'))
-        self.assertEqual(default_translation, unicoded_obj.translate('XX'))
-
-    @mock.patch('gettext.translation')
-    def test_translate_message_with_message_parameter(self, mock_translation):
-        message_with_params = 'A message with param: %s'
-        es_translation = 'A message with param in Spanish: %s'
-        message_param = 'A message param'
-        es_param_translation = 'A message param in Spanish'
-
-        translations = {message_with_params: es_translation,
-                        message_param: es_param_translation}
-        translator = fakes.FakeTranslations.translator({'es': translations})
-        mock_translation.side_effect = translator
-
-        msg = _message.Message(message_with_params)
-        msg_param = _message.Message(message_param)
-        msg = msg % msg_param
-
-        default_translation = message_with_params % message_param
-        expected_translation = es_translation % es_param_translation
-        self.assertEqual(expected_translation, msg.translate('es'))
-        self.assertEqual(default_translation, msg.translate('XX'))
-
-    @mock.patch('gettext.translation')
-    def test_translate_message_with_message_parameters(self, mock_translation):
-        message_with_params = 'A message with params: %s %s'
-        es_translation = 'A message with params in Spanish: %s %s'
-        message_param = 'A message param'
-        es_param_translation = 'A message param in Spanish'
-        another_message_param = 'Another message param'
-        another_es_param_translation = 'Another message param in Spanish'
-
-        translations = {message_with_params: es_translation,
-                        message_param: es_param_translation,
-                        another_message_param: another_es_param_translation}
-        translator = fakes.FakeTranslations.translator({'es': translations})
-        mock_translation.side_effect = translator
-
-        msg = _message.Message(message_with_params)
-        param_1 = _message.Message(message_param)
-        param_2 = _message.Message(another_message_param)
-        msg = msg % (param_1, param_2)
-
-        default_translation = message_with_params % (message_param,
-                                                     another_message_param)
-        expected_translation = es_translation % (es_param_translation,
-                                                 another_es_param_translation)
-        self.assertEqual(expected_translation, msg.translate('es'))
-        self.assertEqual(default_translation, msg.translate('XX'))
-
-    @mock.patch('gettext.translation')
-    def test_translate_message_with_named_parameters(self, mock_translation):
-        message_with_params = 'A message with params: %(param)s'
-        es_translation = 'A message with params in Spanish: %(param)s'
-        message_param = 'A Message param'
-        es_param_translation = 'A message param in Spanish'
-
-        translations = {message_with_params: es_translation,
-                        message_param: es_param_translation}
-        translator = fakes.FakeTranslations.translator({'es': translations})
-        mock_translation.side_effect = translator
-
-        msg = _message.Message(message_with_params)
-        msg_param = _message.Message(message_param)
-        msg = msg % {'param': msg_param}
-
-        default_translation = message_with_params % {'param': message_param}
-        expected_translation = es_translation % {'param': es_param_translation}
-        self.assertEqual(expected_translation, msg.translate('es'))
-        self.assertEqual(default_translation, msg.translate('XX'))
-
-    @mock.patch('locale.getdefaultlocale')
-    @mock.patch('gettext.translation')
-    def test_translate_message_non_default_locale(self,
-                                                  mock_translation,
-                                                  mock_getdefaultlocale):
-        message_with_params = 'A message with params: %(param)s'
-        es_translation = 'A message with params in Spanish: %(param)s'
-        zh_translation = 'A message with params in Chinese: %(param)s'
-        fr_translation = 'A message with params in French: %(param)s'
-
-        message_param = 'A Message param'
-        es_param_translation = 'A message param in Spanish'
-        zh_param_translation = 'A message param in Chinese'
-        fr_param_translation = 'A message param in French'
-
-        es_translations = {message_with_params: es_translation,
-                           message_param: es_param_translation}
-        zh_translations = {message_with_params: zh_translation,
-                           message_param: zh_param_translation}
-        fr_translations = {message_with_params: fr_translation,
-                           message_param: fr_param_translation}
-
-        translator = fakes.FakeTranslations.translator({'es': es_translations,
-                                                        'zh': zh_translations,
-                                                        'fr': fr_translations})
-        mock_translation.side_effect = translator
-        mock_getdefaultlocale.return_value = ('es',)
-
-        msg = _message.Message(message_with_params)
-        msg_param = _message.Message(message_param)
-        msg = msg % {'param': msg_param}
-
-        es_translation = es_translation % {'param': es_param_translation}
-        zh_translation = zh_translation % {'param': zh_param_translation}
-        fr_translation = fr_translation % {'param': fr_param_translation}
-
-        # Because sys.getdefaultlocale() was Spanish,
-        # the default translation will be to Spanish
-        self.assertEqual(es_translation, msg)
-        self.assertEqual(es_translation, msg.translate())
-        self.assertEqual(es_translation, msg.translate('es'))
-
-        # Translation into other locales still works
-        self.assertEqual(zh_translation, msg.translate('zh'))
-        self.assertEqual(fr_translation, msg.translate('fr'))
diff -Nru python-oslo.i18n-1.1.0/tests/test_public_api.py python-oslo.i18n-1.3.0/tests/test_public_api.py
--- python-oslo.i18n-1.1.0/tests/test_public_api.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_public_api.py	2015-01-08 14:46:13.000000000 -0500
@@ -17,7 +17,7 @@
 import mock
 
 from oslo import i18n
-from oslo.i18n import _lazy
+from oslo_i18n import _lazy
 
 
 class PublicAPITest(unittest.TestCase):
diff -Nru python-oslo.i18n-1.1.0/tests/test_translate.py python-oslo.i18n-1.3.0/tests/test_translate.py
--- python-oslo.i18n-1.1.0/tests/test_translate.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_translate.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,44 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from __future__ import unicode_literals
-
-import mock
-from oslotest import base as test_base
-
-from oslo.i18n import _message
-from oslo.i18n import _translate
-from tests import fakes
-from tests import utils
-
-
-class TranslateTest(test_base.BaseTestCase):
-
-    @mock.patch('gettext.translation')
-    def test_translate(self, mock_translation):
-        en_message = 'A message in the default locale'
-        es_translation = 'A message in Spanish'
-        message = _message.Message(en_message)
-
-        es_translations = {en_message: es_translation}
-        translations_map = {'es': es_translations}
-        translator = fakes.FakeTranslations.translator(translations_map)
-        mock_translation.side_effect = translator
-
-        # translate() works on msgs and on objects whose unicode reps are msgs
-        obj = utils.SomeObject(message)
-        self.assertEqual(es_translation, _translate.translate(message, 'es'))
-        self.assertEqual(es_translation, _translate.translate(obj, 'es'))
diff -Nru python-oslo.i18n-1.1.0/tests/test_warning.py python-oslo.i18n-1.3.0/tests/test_warning.py
--- python-oslo.i18n-1.1.0/tests/test_warning.py	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/test_warning.py	2015-01-08 14:46:13.000000000 -0500
@@ -0,0 +1,61 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import imp
+import os
+import warnings
+
+import mock
+from oslotest import base as test_base
+import six
+
+
+class DeprecationWarningTest(test_base.BaseTestCase):
+
+    @mock.patch('warnings.warn')
+    def test_warning(self, mock_warn):
+        import oslo.i18n
+        imp.reload(oslo.i18n)
+        self.assertTrue(mock_warn.called)
+        args = mock_warn.call_args
+        self.assertIn('oslo_i18n', args[0][0])
+        self.assertIn('deprecated', args[0][0])
+        self.assertTrue(issubclass(args[0][1], DeprecationWarning))
+
+    def test_real_warning(self):
+        with warnings.catch_warnings(record=True) as warning_msgs:
+            warnings.resetwarnings()
+            warnings.simplefilter('always', DeprecationWarning)
+            import oslo.i18n
+
+            # Use a separate function to get the stack level correct
+            # so we know the message points back to this file. This
+            # corresponds to an import or reload, which isn't working
+            # inside the test under Python 3.3. That may be due to a
+            # difference in the import implementation not triggering
+            # warnings properly when the module is reloaded, or
+            # because the warnings module is mostly implemented in C
+            # and something isn't cleanly resetting the global state
+            # used to track whether a warning needs to be
+            # emitted. Whatever the cause, we definitely see the
+            # warnings.warn() being invoked on a reload (see the test
+            # above) and warnings are reported on the console when we
+            # run the tests. A simpler test script run outside of
+            # testr does correctly report the warnings.
+            def foo():
+                oslo.i18n.deprecated()
+
+            foo()
+            self.assertEqual(1, len(warning_msgs))
+            msg = warning_msgs[0]
+            self.assertIn('oslo_i18n', six.text_type(msg.message))
+            self.assertEqual('test_warning.py', os.path.basename(msg.filename))
diff -Nru python-oslo.i18n-1.1.0/tests/utils.py python-oslo.i18n-1.3.0/tests/utils.py
--- python-oslo.i18n-1.1.0/tests/utils.py	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tests/utils.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,42 +0,0 @@
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import six
-
-
-class SomeObject(object):
-
-    def __init__(self, message):
-        self.message = message
-
-    def __unicode__(self):
-        return self.message
-    # alias for Python 3
-    __str__ = __unicode__
-
-
-class NoDeepCopyObject(object):
-
-    def __init__(self, value):
-        self.value = value
-
-    if six.PY3:
-        def __str__(self):
-            return str(self.value)
-    else:
-        def __unicode__(self):
-            return unicode(self.value)
-
-    def __deepcopy__(self, memo):
-        raise TypeError('Deep Copy not supported')
diff -Nru python-oslo.i18n-1.1.0/tox.ini python-oslo.i18n-1.3.0/tox.ini
--- python-oslo.i18n-1.1.0/tox.ini	2014-12-02 10:23:02.000000000 -0500
+++ python-oslo.i18n-1.3.0/tox.ini	2015-01-08 14:46:13.000000000 -0500
@@ -38,4 +38,4 @@
 
 [hacking]
 import_exceptions =
-    oslo.i18n._i18n._
+    oslo_i18n._i18n._