From bf1d46353edba3f6a46edf2bc96fb9452efeb9aa Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 6 Feb 2012 08:40:50 -0500
Subject: Split functions to avoid eventlet import.

Some of these functions are used in setup.py. In a virtualenv
based workflow, python setup.py sdist is called to create a
tarball which is then installed into the virtualenv. These
functions need to be in a separate file so that they can be
imported by setup.py without eventlet needing to be installed.

Change-Id: I6f7dc9614895b8c91135c62373b98afe55e1fc7d
---
 openstack/common/setup.py | 42 ++++++++++++++++++++++++++++++++++++++++++
 openstack/common/utils.py | 18 ------------------
 2 files changed, 42 insertions(+), 18 deletions(-)
 create mode 100644 openstack/common/setup.py

(limited to 'openstack/common')

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:
-- 
cgit