diff options
| -rw-r--r-- | openstack/common/setup.py | 42 | ||||
| -rw-r--r-- | openstack/common/utils.py | 18 | ||||
| -rw-r--r-- | tests/unit/test_utils.py | 3 |
3 files changed, 44 insertions, 19 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py new file mode 100644 index 0000000..7966cf7 --- /dev/null +++ b/openstack/common/setup.py @@ -0,0 +1,42 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# 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. + +""" +Utilities with minimum-depends for use in setup.py +""" + +import os +import re +import subprocess + + +def parse_mailmap(mailmap='.mailmap'): + mapping = {} + if os.path.exists(mailmap): + fp = open(mailmap, 'r') + for l in fp: + l = l.strip() + if not l.startswith('#') and ' ' in l: + canonical_email, alias = l.split(' ') + mapping[alias] = canonical_email + return mapping + + +def str_dict_replace(s, mapping): + for s1, s2 in mapping.iteritems(): + s = s.replace(s1, s2) + return s diff --git a/openstack/common/utils.py b/openstack/common/utils.py index 1faeab5..fe7b63d 100644 --- a/openstack/common/utils.py +++ b/openstack/common/utils.py @@ -172,24 +172,6 @@ def parse_isotime(timestr): return datetime.datetime.strptime(timestr, TIME_FORMAT) -def parse_mailmap(mailmap='.mailmap'): - mapping = {} - if os.path.exists(mailmap): - fp = open(mailmap, 'r') - for l in fp: - l = l.strip() - if not l.startswith('#') and ' ' in l: - canonical_email, alias = l.split(' ') - mapping[alias] = canonical_email - return mapping - - -def str_dict_replace(s, mapping): - for s1, s2 in mapping.iteritems(): - s = s.replace(s1, s2) - return s - - def utcnow(): """Overridable version of utils.utcnow.""" if utcnow.override_time: diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index db1288f..45205e9 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -23,6 +23,7 @@ import mock from openstack.common import exception from openstack.common import utils +from openstack.common import setup class UtilsTest(unittest.TestCase): @@ -111,7 +112,7 @@ class UtilsTest(unittest.TestCase): string = 'Johnnie T. Hozer' mapping = {'T.': 'The'} self.assertEqual('Johnnie The Hozer', - utils.str_dict_replace(string, mapping)) + setup.str_dict_replace(string, mapping)) def test_utcnow(self): utils.set_time_override(mock.sentinel.utcnow) |