From e192a39af30e436ca40a621462ab593d367ccd01 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Wed, 24 Jun 2015 16:56:55 -0500 Subject: [PATCH] Do not fall back to namespaced oslo.i18n The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: I831eb6b773d80edc233fd6f6e565ca6f24b65210 --- glanceclient/_i18n.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/glanceclient/_i18n.py b/glanceclient/_i18n.py index 6963c076..a099c7fa 100644 --- a/glanceclient/_i18n.py +++ b/glanceclient/_i18n.py @@ -12,10 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -try: - import oslo_i18n as i18n -except ImportError: - from oslo import i18n +import oslo_i18n as i18n _translators = i18n.TranslatorFactory(domain='glanceclient')