diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-11 22:46:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-11 22:46:08 +0000 |
| commit | 7a3ab8ac15b2d73eafbe9eaf722e3a402c5102d6 (patch) | |
| tree | 7044ac0584e21d5d70d5906c5e2d238c5eb5205a /openstack/common/rpc | |
| parent | 943997e9f1d4ec609532a13712561ee817029b81 (diff) | |
| parent | 372d11e990a544a645ce74ebfd56f19a0b422d28 (diff) | |
| download | oslo-7a3ab8ac15b2d73eafbe9eaf722e3a402c5102d6.tar.gz oslo-7a3ab8ac15b2d73eafbe9eaf722e3a402c5102d6.tar.xz oslo-7a3ab8ac15b2d73eafbe9eaf722e3a402c5102d6.zip | |
Merge "Fix line length for pep8 compliance after cloning into other projects"
Diffstat (limited to 'openstack/common/rpc')
| -rw-r--r-- | openstack/common/rpc/__init__.py | 4 | ||||
| -rw-r--r-- | openstack/common/rpc/impl_zmq.py | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/openstack/common/rpc/__init__.py b/openstack/common/rpc/__init__.py index 473268d..f9e44c7 100644 --- a/openstack/common/rpc/__init__.py +++ b/openstack/common/rpc/__init__.py @@ -47,7 +47,9 @@ rpc_opts = [ help='Seconds to wait before a cast expires (TTL). ' 'Only supported by impl_zmq.'), cfg.ListOpt('allowed_rpc_exception_modules', - default=['openstack.common.exception', 'nova.exception'], + default=['openstack.common.exception', + 'nova.exception', + ], help='Modules of exceptions that are permitted to be recreated' 'upon receiving exception data from an rpc call.'), cfg.StrOpt('control_exchange', diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py index 77723ca..bbdb40f 100644 --- a/openstack/common/rpc/impl_zmq.py +++ b/openstack/common/rpc/impl_zmq.py @@ -47,9 +47,12 @@ zmq_opts = [ 'address.'), # The module.Class to use for matchmaking. - cfg.StrOpt('rpc_zmq_matchmaker', - default='openstack.common.rpc.matchmaker.MatchMakerLocalhost', - help='MatchMaker driver'), + cfg.StrOpt( + 'rpc_zmq_matchmaker', + default=('openstack.common.rpc' + 'matchmaker.MatchMakerLocalhost'), + help='MatchMaker driver', + ), # The following port is unassigned by IANA as of 2012-05-21 cfg.IntOpt('rpc_zmq_port', default=9501, |