made this i18n importing sane

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

Clay Gerrard

2010年12月29日 13:14:43 -06:00

parent 4e6fa8152c

commit e54846d850

3 changed files with 2 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
swift/init.py

View File

@@ -1 +1,3 @@

__version__ = '1.1.0'

import gettext

gettext.install('swift')

2
swift/common/daemon.py

View File

@@ -16,7 +16,6 @@

import os

import sys

import signal

import gettext

from re import sub

from swift.common import utils

@@ -42,7 +41,6 @@ class Daemon(object):

utils.validate_configuration()

utils.capture_stdio(self.logger, **kwargs)

utils.drop_privileges(self.conf.get('user', 'swift'))

gettext.install('swift', unicode=1)

def kill_children(*args):

signal.signal(signal.SIGTERM, signal.SIG_IGN)

2
swift/common/wsgi.py

View File

@@ -21,7 +21,6 @@ import signal

import sys

import time

import mimetools

import gettext

import eventlet

from eventlet import greenio, GreenPool, sleep, wsgi, listen

@@ -121,7 +120,6 @@ def run_wsgi(conf_file, app_section, *args, **kwargs):

sock = get_socket(conf, default_port=kwargs.get('default_port', 8080))

# remaining tasks should not require elevated privileges

drop_privileges(conf.get('user', 'swift'))

gettext.install('swift', unicode=1)

# finally after binding to ports and privilege drop, run app __init__ code

app = loadapp('config:%s' % conf_file, global_conf={'log_name': log_name})