You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2014/10/24 19:56:40 UTC
svn commit: r1634106 - in /qpid/dispatch/trunk/python:
qpid_dispatch/management/ qpid_dispatch_internal/compat/
qpid_dispatch_internal/management/ qpid_dispatch_internal/tools/
Author: aconway
Date: Fri Oct 24 17:56:40 2014
New Revision: 1634106
URL: http://svn.apache.org/r1634106
Log:
NO-JIRA: Cleaned up pylint warnings in management code.
Modified:
qpid/dispatch/trunk/python/qpid_dispatch/management/client.py
qpid/dispatch/trunk/python/qpid_dispatch/management/entity.py
qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/__init__.py
qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py
qpid/dispatch/trunk/python/qpid_dispatch_internal/management/config.py
qpid/dispatch/trunk/python/qpid_dispatch_internal/management/qdrouter.py
qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/options.py
Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/client.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/client.py?rev=1634106&r1=1634105&r2=1634106&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/management/client.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/client.py Fri Oct 24 17:56:40 2014
@@ -154,7 +154,7 @@ class Node(object):
return Node.CORRELATION_ID
@staticmethod
- def check_response(response, request, expect=OK):
+ def check_response(response, expect=OK):
"""
Check a management response message for errors and correlation ID.
"""
@@ -201,7 +201,7 @@ class Node(object):
response = self.message_impl.fetch()
# Ignore mismatched correlation IDs, responses to earlier requests that timed out.
if response.correlation_id == request.correlation_id: break
- self.check_response(response, request, expect=expect)
+ self.check_response(response, expect=expect)
return response
class QueryResponse(object):
Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/entity.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/entity.py?rev=1634106&r1=1634105&r2=1634106&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/management/entity.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/entity.py Fri Oct 24 17:56:40 2014
@@ -57,7 +57,8 @@ class Entity(object):
def __getitem__(self, name): return self.attributes[name]
- def _pyname(self, name): return name.replace('-', '_')
+ @staticmethod
+ def _pyname(name): return name.replace('-', '_')
def _set(self, name, value):
self.attributes[name] = value
@@ -67,7 +68,7 @@ class Entity(object):
# e.g. validation.
def __setitem__(self, name, value): self._set(name, value)
- def __delitem__(self, name, value):
+ def __delitem__(self, name):
del self.attributes[name]
del self.__dict__[self._pyname(name)]
@@ -86,7 +87,7 @@ def update(entity, values):
"""
for k, v in values.iteritems(): entity[k] = v
-SEPARATOR_RE = re.compile(' |_|-|\.')
+SEPARATOR_RE = re.compile(r' |_|-|\.')
def camelcase(str, capital=False):
"""Convert string str with ' ', '_', '.' or '-' separators to camelCase."""
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/__init__.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/__init__.py?rev=1634106&r1=1634105&r2=1634106&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/__init__.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/compat/__init__.py Fri Oct 24 17:56:40 2014
@@ -27,6 +27,6 @@ try: from collections import OrderedDict
except: from ordereddict import OrderedDict
if sys.version_info >= (2, 7):
- json_load_kwargs = {'object_pairs_hook':OrderedDict}
+ JSON_LOAD_KWARGS = {'object_pairs_hook':OrderedDict}
else:
- json_load_kwargs = {}
+ JSON_LOAD_KWARGS = {}
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py?rev=1634106&r1=1634105&r2=1634106&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py Fri Oct 24 17:56:40 2014
@@ -48,7 +48,7 @@ Adding/removing/updating entities from C
4. unlocks the router.
"""
-import re, traceback
+import traceback
from itertools import ifilter, chain
from traceback import format_exc
from threading import Lock
@@ -114,7 +114,7 @@ class Entity(SchemaEntity):
updatefn = self._qd.function(
fname, c_long, [py_object, c_void_p])
def _do_update():
- updatefn(self.attributes, pointer);
+ updatefn(self.attributes, pointer)
return True
self.__dict__['_update'] = _do_update
@@ -267,7 +267,7 @@ class EntityCache(object):
def _remove(self, entity):
try:
- self.entities.remove(entity);
+ self.entities.remove(entity)
self.log(LOG_DEBUG, "Remove %s entity: %s" %
(entity.entity_type.short_name, entity.attributes['identity']))
except ValueError: pass
@@ -276,7 +276,7 @@ class EntityCache(object):
self._remove(entity)
def remove_pointer(self, pointer):
- self._remove_pointer()
+ self._remove_pointer(pointer)
def _remove_pointer(self, pointer):
if pointer in self.pointers:
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/management/config.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/management/config.py?rev=1634106&r1=1634105&r2=1634106&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/management/config.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/management/config.py Fri Oct 24 17:56:40 2014
@@ -57,7 +57,6 @@ class Config(object):
spare_comma = re.compile(r',\s*([]}])') # Strip spare commas
js_text = re.sub(spare_comma, r'\1', js_text)
# Convert dictionary keys to camelCase
- def cameldict(pairs): return dict((camelcase(k), v) for k, v in pairs)
sections = json.loads(js_text)
for s in sections:
s[0] = camelcase(s[0])
@@ -161,7 +160,7 @@ def configure_dispatch(dispatch, filenam
qd.qd_dispatch_prepare(dispatch)
agent.activate("$management")
- qd.qd_router_setup_late(dispatch);
+ qd.qd_router_setup_late(dispatch)
# Note must configure addresses, waypoints, listeners and connectors after qd_dispatch_prepare
for a in config.by_type('fixedAddress'): qd.qd_dispatch_configure_address(dispatch, a)
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/management/qdrouter.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/management/qdrouter.py?rev=1634106&r1=1634105&r2=1634106&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/management/qdrouter.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/management/qdrouter.py Fri Oct 24 17:56:40 2014
@@ -24,7 +24,7 @@ Qpid Dispatch Router management schema a
import json
from pkgutil import get_data
from . import schema
-from ..compat import json_load_kwargs
+from ..compat import JSON_LOAD_KWARGS
class QdSchema(schema.Schema):
"""
@@ -32,8 +32,8 @@ class QdSchema(schema.Schema):
"""
def __init__(self):
"""Load schema."""
- schema = get_data('qpid_dispatch.management', 'qdrouter.json')
- super(QdSchema, self).__init__(**json.loads(schema, **json_load_kwargs))
+ qd_schema = get_data('qpid_dispatch.management', 'qdrouter.json')
+ super(QdSchema, self).__init__(**json.loads(qd_schema, **JSON_LOAD_KWARGS))
def validate(self, entities, full=True, **kwargs):
"""
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/options.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/options.py?rev=1634106&r1=1634105&r2=1634106&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/options.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/options.py Fri Oct 24 17:56:40 2014
@@ -23,7 +23,7 @@ from optparse import OptionGroup
def connection_options(options, title="Connection Options"):
"""Return an OptionGroup for connection options."""
group = OptionGroup(options, title)
- group.add_option("-b", "--bus", action="store", type="string", default="0.0.0.0",
+ group.add_option("-b", "--bus", action="store", type="string", default="0.0.0.0",
metavar="<url>", help="URL of the messaging bus to connect to (default %default)")
group.add_option("-r", "--router", action="store", type="string", default=None,
metavar="<router-id>", help="Router to be queried")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org