openstack
/
oslo.messaging
Code Issues Proposed changes

Misc pep8 fixes

This commit is contained in:
Mark McLoughlin 2013-06-10 14:46:09 +01:00
parent 81e8dc9033
commit 23c566e3e2
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/common/messaging/_server.py
View File

@ -16,7 +16,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from openstack.common.gettextutils import _
from openstack.common import log as logging
_LOG = logging.getLogger(__name__)

4
openstack/common/messaging/rpc/_dispatcher.py
View File

@ -18,10 +18,10 @@
from openstack.common.gettextutils import _
from openstack.common import log as logging
from openstack.common.messaging import serializer as msg_serializer
from openstack.common.messaging import _server as server
from openstack.common.messaging import target
from openstack.common.messaging import _utils as utils
from openstack.common.messaging import serializer as msg_serializer
from openstack.common.messaging import target
_LOG = logging.getLogger(__name__)

10
openstack/common/messaging/rpc/client.py
View File

@ -23,9 +23,8 @@ from oslo.config import cfg
from openstack.common.gettextutils import _
from openstack.common import local
from openstack.common import log as logging
from openstack.common.messaging import serializer as msg_serializer
from openstack.common.messaging import target
from openstack.common.messaging import _utils as utils
from openstack.common.messaging import serializer as msg_serializer
_client_opts = [
cfg.IntOpt('rpc_response_timeout',
@ -86,8 +85,8 @@ class _CallContext(object):
if not self.conf.debug:
return None
if (hasattr(local.strong_store, 'locks_held') and
local.strong_store.locks_held):
if ((hasattr(local.strong_store, 'locks_held') and
local.strong_store.locks_held)):
stack = ' :: '.join([frame[3] for frame in inspect.stack()])
_LOG.warn(_('An RPC is being made while holding a lock. The locks '
'currently held are %(locks)s. This is probably a bug. '
@ -245,7 +244,8 @@ class RPCClient(object):
version=version,
server=server,
fanout=fanout)
kwargs = dict([(k, v) for k, v in kwargs.items() if v is not self._marker])
kwargs = dict([(k, v) for k, v in kwargs.items()
if v is not self._marker])
target = self.target(**kwargs)
if timeout is self._marker:

2
openstack/common/messaging/rpc/server.py
View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from openstack.common.messaging import _server
from openstack.common.messaging._executors import impl_blocking
from openstack.common.messaging import _server
from openstack.common.messaging.rpc import _dispatcher
"""