diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-09 08:26:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-09 08:26:06 +0000 |
| commit | 54f0d4eb858143b07df9a026088f0d4e02bfad87 (patch) | |
| tree | 95cc846f15d22a915e008e0f0623c2470855a558 /openstack/common/utils.py | |
| parent | 1a21847271ebebfef0d8158eafbe4172b5c62c98 (diff) | |
| parent | bf1d46353edba3f6a46edf2bc96fb9452efeb9aa (diff) | |
| download | oslo-54f0d4eb858143b07df9a026088f0d4e02bfad87.tar.gz oslo-54f0d4eb858143b07df9a026088f0d4e02bfad87.tar.xz oslo-54f0d4eb858143b07df9a026088f0d4e02bfad87.zip | |
Merge "Split functions to avoid eventlet import."
Diffstat (limited to 'openstack/common/utils.py')
| -rw-r--r-- | openstack/common/utils.py | 18 |
1 files changed, 0 insertions, 18 deletions
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: |