openstack/oslo.db
Code Issues Proposed changes

Replace utils method with oslo.utils reflection provided one

Browse Source 
Change-Id: Ife14a6acd01a16c4b1092b43fb94942db0e03036
This commit is contained in:
Joshua Harlow 2015-06-06 22:55:06 -07:00
parent 42de3f6b49
commit e0f0608db5
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oslo_db/sqlalchemy/test_base.py
View File

@ -25,12 +25,13 @@ except ImportError:
import os
from oslo_utils import reflection
import six
from oslo_db import exception
from oslo_db.sqlalchemy import provision
from oslo_db.sqlalchemy import session
from oslo_db.sqlalchemy import utils
class DbFixture(fixtures.Fixture):
@ -192,7 +193,7 @@ def backend_specific(*dialects):
if self.engine.name not in dialects:
msg = ('The test "%s" can be run '
'only on %s. Current engine is %s.')
args = (utils.get_callable_name(f), ' '.join(dialects),
args = (reflection.get_callable_name(f), ' '.join(dialects),
self.engine.name)
self.skip(msg % args)
else:

25
oslo_db/sqlalchemy/utils.py
View File

@ -54,31 +54,6 @@ LOG = logging.getLogger(__name__)
_DBURL_REGEX = re.compile(r"[^:]+://([^:]+):([^@]+)@.+")
def get_callable_name(function):
# TODO(harlowja): Replace this once
# it is possible to use https://review.openstack.org/#/c/122495/ which is
# a more complete and expansive module that does a similar thing...
try:
method_self = six.get_method_self(function)
except AttributeError:
method_self = None
if method_self is not None:
if isinstance(method_self, six.class_types):
im_class = method_self
else:
im_class = type(method_self)
try:
parts = (im_class.__module__, function.__qualname__)
except AttributeError:
parts = (im_class.__module__, im_class.__name__, function.__name__)
else:
try:
parts = (function.__module__, function.__qualname__)
except AttributeError:
parts = (function.__module__, function.__name__)
return '.'.join(parts)
def sanitize_db_url(url):
match = _DBURL_REGEX.match(url)
if match: