openstack-attic/melange
Code Issues Proposed changes

Update to latest openstack-common

Browse Source 
Simply by running:

  $> cd openstack-common
  $> python update.py ../melange

We should do this more often.

Change-Id: I07ac084a14283c38ed39ecb9535436b96365bda8
This commit is contained in:
Mark McLoughlin 2012-03-09 11:17:43 +00:00
parent 01cb899ef7
commit ae0ceea3e9
5 changed files with 63 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
melange/openstack/common/config.py
View File

@ -62,8 +62,8 @@ def add_common_options(parser):
:param parser: optparse.OptionParser :param parser: optparse.OptionParser
""" """
help_text = "The following configuration options are common to "\ help_text = ("The following configuration options are common to "
"this app's programs." "this app's programs.")
group = optparse.OptionGroup(parser, "Common Options", help_text) group = optparse.OptionGroup(parser, "Common Options", help_text)
group.add_option('-v', '--verbose', default=False, dest="verbose", group.add_option('-v', '--verbose', default=False, dest="verbose",
@ -88,8 +88,8 @@ def add_log_options(parser):
:param parser: optparse.OptionParser :param parser: optparse.OptionParser
""" """
help_text = "The following configuration options are specific to logging "\ help_text = ("The following configuration options are specific to "
"functionality for this program." "logging functionality for this program.")
group = optparse.OptionGroup(parser, "Logging Options", help_text) group = optparse.OptionGroup(parser, "Logging Options", help_text)
group.add_option('--log-config', default=None, metavar="PATH", group.add_option('--log-config', default=None, metavar="PATH",
@ -133,10 +133,10 @@ def setup_logging(options, conf):
# If either the CLI option or the conf value # If either the CLI option or the conf value
# is True, we set to True # is True, we set to True
debug = options.get('debug') or \ debug = (options.get('debug') or
get_option(conf, 'debug', type='bool', default=False) get_option(conf, 'debug', type='bool', default=False))
verbose = options.get('verbose') or \ verbose = (options.get('verbose') or
get_option(conf, 'verbose', type='bool', default=False) get_option(conf, 'verbose', type='bool', default=False))
root_logger = logging.root root_logger = logging.root
if debug: if debug:
root_logger.setLevel(logging.DEBUG) root_logger.setLevel(logging.DEBUG)
@ -157,8 +157,8 @@ def setup_logging(options, conf):
if not logfile: if not logfile:
logfile = conf.get('log_file') logfile = conf.get('log_file')
use_syslog = options.get('use_syslog') or \ use_syslog = (options.get('use_syslog') or
get_option(conf, 'use_syslog', type='bool', default=False) get_option(conf, 'use_syslog', type='bool', default=False))
if use_syslog: if use_syslog:
handler = logging.handlers.SysLogHandler(address='/dev/log') handler = logging.handlers.SysLogHandler(address='/dev/log')
@ -289,10 +289,10 @@ def load_paste_app(app_name, options, args, config_dir=None):
# We only update the conf dict for the verbose and debug # We only update the conf dict for the verbose and debug
# flags. Everything else must be set up in the conf file... # flags. Everything else must be set up in the conf file...
debug = options.get('debug') or \ debug = (options.get('debug') or
get_option(conf, 'debug', type='bool', default=False) get_option(conf, 'debug', type='bool', default=False))
verbose = options.get('verbose') or \ verbose = (options.get('verbose') or
get_option(conf, 'verbose', type='bool', default=False) get_option(conf, 'verbose', type='bool', default=False))
conf['debug'] = debug conf['debug'] = debug
conf['verbose'] = verbose conf['verbose'] = verbose

32
melange/openstack/common/setup.py
View File

@ -36,10 +36,13 @@ def parse_mailmap(mailmap='.mailmap'):
return mapping return mapping
def str_dict_replace(s, mapping): def canonicalize_emails(changelog, mapping):
for s1, s2 in mapping.iteritems(): """ Takes in a string and an email alias mapping and replaces all
s = s.replace(s1, s2) instances of the aliases in the string with their real email
return s """
for alias, email in mapping.iteritems():
changelog = changelog.replace(alias, email)
return changelog
# Get requirements from the first file that exists # Get requirements from the first file that exists
@ -87,20 +90,22 @@ def write_requirements():
req_file.write(requirements) req_file.write(requirements)
def run_git_command(cmd): def _run_shell_command(cmd):
output = subprocess.Popen(["/bin/sh", "-c", cmd], output = subprocess.Popen(["/bin/sh", "-c", cmd],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
return output.communicate()[0].strip() return output.communicate()[0].strip()
def write_vcsversion(location): def write_vcsversion(location):
""" Produce a vcsversion dict that mimics the old one produced by bzr
"""
if os.path.isdir('.git'): if os.path.isdir('.git'):
branch_nick_cmd = 'git branch | grep -Ei "\* (.*)" | cut -f2 -d" "' branch_nick_cmd = 'git branch | grep -Ei "\* (.*)" | cut -f2 -d" "'
branch_nick = run_git_command(branch_nick_cmd) branch_nick = _run_shell_command(branch_nick_cmd)
revid_cmd = "git --no-pager log --max-count=1 --pretty=oneline" revid_cmd = "git rev-parse HEAD"
revid = run_git_command(revid_cmd).split()[0] revid = _run_shell_command(revid_cmd).split()[0]
revno_cmd = "git --no-pager log --oneline | wc -l" revno_cmd = "git log --oneline | wc -l"
revno = run_git_command(revno_cmd) revno = _run_shell_command(revno_cmd)
with open(location, 'w') as version_file: with open(location, 'w') as version_file:
version_file.write(""" version_file.write("""
# This file is automatically generated by setup.py, So don't edit it. :) # This file is automatically generated by setup.py, So don't edit it. :)
@ -113,9 +118,10 @@ version_info = {
def write_git_changelog(): def write_git_changelog():
""" Write a changelog based on the git changelog """
if os.path.isdir('.git'): if os.path.isdir('.git'):
git_log_gnu = 'git log --format="%ai %aN %n%n%x09* %s%d%n"' git_log_cmd = 'git log --stat'
changelog = run_git_command(git_log_gnu) changelog = _run_shell_command(git_log_cmd)
mailmap = parse_mailmap() mailmap = parse_mailmap()
with open("ChangeLog", "w") as changelog_file: with open("ChangeLog", "w") as changelog_file:
changelog_file.write(str_dict_replace(changelog, mailmap)) changelog_file.write(canonicalize_emails(changelog, mailmap))

33
melange/openstack/common/utils.py
View File

@ -25,15 +25,15 @@ import os
import random import random
import shlex import shlex
import sys import sys
import types
from eventlet import greenthread from eventlet import greenthread
from eventlet.green import subprocess from eventlet.green import subprocess
import iso8601
from melange.openstack.common import exception from melange.openstack.common import exception
TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" TIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -60,9 +60,9 @@ def bool_from_string(subject):
Useful for JSON-decoded stuff and config file parsing Useful for JSON-decoded stuff and config file parsing
""" """
if isinstance(subject, types.BooleanType): if isinstance(subject, bool):
return subject return subject
if isinstance(subject, types.StringTypes): if isinstance(subject, basestring):
if subject.strip().lower() in ('true', 'on', '1'): if subject.strip().lower() in ('true', 'on', '1'):
return True return True
return False return False
@ -120,8 +120,9 @@ def execute(*cmd, **kwargs):
_returncode = obj.returncode # pylint: disable=E1101 _returncode = obj.returncode # pylint: disable=E1101
if _returncode: if _returncode:
LOG.debug(_('Result was %s') % _returncode) LOG.debug(_('Result was %s') % _returncode)
if type(check_exit_code) == types.IntType \ if (isinstance(check_exit_code, int) and
and _returncode != check_exit_code: not isinstance(check_exit_code, bool) and
_returncode != check_exit_code):
(stdout, stderr) = result (stdout, stderr) = result
raise exception.ProcessExecutionError( raise exception.ProcessExecutionError(
exit_code=_returncode, exit_code=_returncode,
@ -163,13 +164,29 @@ def import_object(import_str):
def isotime(at=None): def isotime(at=None):
"""Stringify time in ISO 8601 format"""
if not at: if not at:
at = datetime.datetime.utcnow() at = datetime.datetime.utcnow()
return at.strftime(TIME_FORMAT) str = at.strftime(TIME_FORMAT)
tz = at.tzinfo.tzname(None) if at.tzinfo else 'UTC'
str += ('Z' if tz == 'UTC' else tz)
return str
def parse_isotime(timestr): def parse_isotime(timestr):
return datetime.datetime.strptime(timestr, TIME_FORMAT) """Parse time from ISO 8601 format"""
try:
return iso8601.parse_date(timestr)
except iso8601.ParseError as e:
raise ValueError(e.message)
except TypeError as e:
raise ValueError(e.message)
def normalize_time(timestamp):
"""Normalize time in arbitrary timezone to UTC"""
offset = timestamp.utcoffset()
return timestamp.replace(tzinfo=None) - offset if offset else timestamp
def utcnow(): def utcnow():

8
melange/openstack/common/wsgi.py
View File

@ -495,8 +495,8 @@ class ResponseSerializer(object):
} }
self.body_serializers.update(body_serializers or {}) self.body_serializers.update(body_serializers or {})
self.headers_serializer = headers_serializer or \ self.headers_serializer = (headers_serializer or
ResponseHeadersSerializer() ResponseHeadersSerializer())
def serialize(self, response_data, content_type, action='default'): def serialize(self, response_data, content_type, action='default'):
"""Serialize a dict into a string and wrap in a wsgi.Request object. """Serialize a dict into a string and wrap in a wsgi.Request object.
@ -550,8 +550,8 @@ class RequestDeserializer(object):
} }
self.body_deserializers.update(body_deserializers or {}) self.body_deserializers.update(body_deserializers or {})
self.headers_deserializer = headers_deserializer or \ self.headers_deserializer = (headers_deserializer or
RequestHeadersDeserializer() RequestHeadersDeserializer())
def deserialize(self, request): def deserialize(self, request):
"""Extract necessary pieces of the request. """Extract necessary pieces of the request.

1
tools/pip-requires
View File

@ -13,3 +13,4 @@ webtest
factory_boy factory_boy
httplib2 httplib2
lxml lxml
iso8601