From 6f313359d5edf451cd5ae457117bd28a257a9e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirit=20S=C3=A6lensminde?= Date: Tue, 21 Oct 2014 10:11:10 +0700 Subject: [PATCH] Fix up pylint problems for the latest version of pylint. --- pylintrc | 5 +---- slumber/configuration.py | 10 +++++----- slumber/connector/api.py | 4 ++-- slumber/connector/ua.py | 2 +- slumber/operations/__init__.py | 5 +++-- slumber/operations/authenticate.py | 6 +++--- slumber/operations/authorization.py | 2 +- slumber/operations/instancedata.py | 2 +- slumber/server/__init__.py | 2 +- slumber/server/http.py | 2 +- slumber/server/json.py | 2 +- slumber/server/model.py | 2 +- slumber/test.py | 5 +---- slumber/urls.py | 4 +--- 14 files changed, 23 insertions(+), 30 deletions(-) diff --git a/pylintrc b/pylintrc index 48e66e7..6870ffc 100644 --- a/pylintrc +++ b/pylintrc @@ -33,7 +33,7 @@ load-plugins= # R0903 Too few public methods # W0142 Used * or ** magic # W0212 Access to protected member -disable=I0011, R0903, W0142, W0212 +disable=I0011, R0903, W0142, W0212, bad-continuation, cyclic-import [REPORTS] @@ -42,9 +42,6 @@ disable=I0011, R0903, W0142, W0212 # (visual studio) and html output-format=colorized -# Include message's id in output -include-ids=yes - # Put messages in a separate file for each module / package specified on the # command line instead of printing them on stdout. Reports (if any) will be # written in a file name "pylint_global.[txt|html]". diff --git a/slumber/configuration.py b/slumber/configuration.py index d40ba38..a30adb3 100644 --- a/slumber/configuration.py +++ b/slumber/configuration.py @@ -11,11 +11,11 @@ def configure(arg, - properties_ro = None, - to_json = None, - operations_extra = None, - instance_proxy = None, - model_proxy = None): + properties_ro=None, + to_json=None, + operations_extra=None, + instance_proxy=None, + model_proxy=None): """Configure Slumber for the provided model. When configuring the server side the model is a model instance. When diff --git a/slumber/connector/api.py b/slumber/connector/api.py index a4395f7..4d4dbc2 100644 --- a/slumber/connector/api.py +++ b/slumber/connector/api.py @@ -19,7 +19,7 @@ def _ensure_absolute(url): assert urlparse(url)[0], "The URL <%s> must be absolute" % url -def get_instance(model, instance_url, display_name, fields = None): +def get_instance(model, instance_url, display_name, fields=None): """Return an instance of the specified model etc. """ if isinstance(model, basestring): @@ -128,7 +128,7 @@ class _InstanceProxy(object): by the application code and the underlying object. This allows us to better handle the cache. """ - def __init__(self, url, display, fields = None): + def __init__(self, url, display, fields=None): super(_InstanceProxy, self).__init__() self._url = url self._display = display diff --git a/slumber/connector/ua.py b/slumber/connector/ua.py index f37e44a..8d8b211 100644 --- a/slumber/connector/ua.py +++ b/slumber/connector/ua.py @@ -281,7 +281,7 @@ def _post(url, data, codes): headers.update(_sign_request('POST', urlparse(url).path, body)) headers['Content-Type'] = 'application/json' response, content = _real().request(url, "POST", body=body, - headers = headers) + headers=headers) assert response.status in (codes or [200]), \ (url, response, content) try: diff --git a/slumber/operations/__init__.py b/slumber/operations/__init__.py index 3e69289..d9393a1 100644 --- a/slumber/operations/__init__.py +++ b/slumber/operations/__init__.py @@ -22,7 +22,7 @@ class Operation(object): """ METHODS = ['GET', 'OPTIONS', 'POST', 'PUT', 'DELETE'] - def __init__(self, model, name, uri = None): + def __init__(self, model, name, uri=None): self.model = model self.name = name self.uri = uri @@ -99,6 +99,7 @@ class InstanceOperation(ModelOperation): """Base class for operations on instances. """ model_operation = False - def __init__(self, model, name, uri = None): + def __init__(self, model, name, uri=None): super(InstanceOperation, self).__init__(model, name, uri) self.regex = '([^/]+)/' + diff --git a/slumber/operations/authenticate.py b/slumber/operations/authenticate.py index 63d010d..6468337 100644 --- a/slumber/operations/authenticate.py +++ b/slumber/operations/authenticate.py @@ -19,8 +19,8 @@ def post(self, request, response, _appname, _modelname): response['authenticated'] = bool(user) if user: response['user'] = dict( - pk = user.pk, - display_name = unicode(user), - url = self.model.operations['data'](user)) + pk=user.pk, + display_name=unicode(user), + url=self.model.operations['data'](user)) else: response['user'] = None diff --git a/slumber/operations/authorization.py b/slumber/operations/authorization.py index d322bf5..3617591 100644 --- a/slumber/operations/authorization.py +++ b/slumber/operations/authorization.py @@ -48,7 +48,7 @@ class GetPermissions(InstanceOperation): """Exposes the get_group_permissions API on Users. """ - def get(self, _request , response, _appname, _modelname, pk): + def get(self, _request, response, _appname, _modelname, pk): """Implements the API. """ user = self.model.model.objects.get(pk=pk) diff --git a/slumber/operations/instancedata.py b/slumber/operations/instancedata.py index c61e310..b915121 100644 --- a/slumber/operations/instancedata.py +++ b/slumber/operations/instancedata.py @@ -49,7 +49,7 @@ class InstanceData(Operation): model_operation = False @require_user - def get(self, request, response, pk, dataset = None): + def get(self, request, response, pk, dataset=None): """Implement the fetching of attribute data for an instance. """ instance = self.model.model.objects.get(pk=pk) diff --git a/slumber/server/__init__.py b/slumber/server/__init__.py index f609ee7..6503b58 100644 --- a/slumber/server/__init__.py +++ b/slumber/server/__init__.py @@ -88,7 +88,7 @@ def get_slumber_local_url_prefix(): '%s://%s/' % (parsed[0], parsed[1])) -def get_slumber_services(directory = None): +def get_slumber_services(directory=None): """Returns the slumber services from the directory (if specified) """ if not directory: diff --git a/slumber/server/http.py b/slumber/server/http.py index aaf0182..e22b123 100644 --- a/slumber/server/http.py +++ b/slumber/server/http.py @@ -92,7 +92,7 @@ def wrapper(request, *args, **kwargs): except NotAuthorised, _: response = { '_meta': dict(status=401, message='Unauthorized', - headers= {'WWW-Authenticate':'FOST Realm="Slumber"'}), + headers={'WWW-Authenticate':'FOST Realm="Slumber"'}), 'error': 'No user is logged in'} except Forbidden, exception: response = {'_meta': dict(status=403, message='Forbidden'), diff --git a/slumber/server/json.py b/slumber/server/json.py index a45996e..b9c98ff 100644 --- a/slumber/server/json.py +++ b/slumber/server/json.py @@ -29,7 +29,7 @@ def to_json_data(model, instance, fieldname, fieldmeta): root = get_slumber_root() return dict(type=root + rel_to.path, display=unicode(value), - data = root + rel_to.path + 'data/%s/' % value.pk) + data=root + rel_to.path + 'data/%s/' % value.pk) elif DATA_MAPPING.has_key(fieldmeta['type']): func = DATA_MAPPING[fieldmeta['type']] return func(model, instance, fieldmeta, value) diff --git a/slumber/server/model.py b/slumber/server/model.py index a6d07ec..787e536 100644 --- a/slumber/server/model.py +++ b/slumber/server/model.py @@ -84,7 +84,7 @@ def fields(self): fields[field] = dict( name=field, kind='object', - type= get_slumber_root() + + type=get_slumber_root() + DJANGO_MODEL_TO_SLUMBER_MODEL[definition.rel.to].path, verbose_name=definition.verbose_name) else: diff --git a/slumber/test.py b/slumber/test.py index 8c21890..574f234 100644 --- a/slumber/test.py +++ b/slumber/test.py @@ -10,9 +10,6 @@ class _Operations(object): """Allows us to fetch URLs for operations in mocks reliably. """ - # Badly implemented Container, implements __getitem__ but not - # __delitem__, __len__, __setitem__ - # pylint: disable=R0924 def __init__(self, url): self._url = 'http://' + url self._suffix = '/' @@ -160,7 +157,7 @@ def do_get(self, url, _ttl=0, _codes=None, _headers=None): self.test.assertIsNone(edata) return None, rdata - def do_post(self, url, data, _codes = None): + def do_post(self, url, data, _codes=None): """The patch for the user agent post. """ self.test.assertTrue(self.expectations, diff --git a/slumber/urls.py b/slumber/urls.py index 7236243..477d678 100644 --- a/slumber/urls.py +++ b/slumber/urls.py @@ -12,6 +12,4 @@ # The name urlpatterns is defined by Django and we can't change it # pylint: disable=C0103 -#urlpatterns = patterns('', *_urls.items()) -urlpatterns = patterns('', - ('.*', 'slumber.server.views.service_root')) +urlpatterns = patterns('', ('.*', 'slumber.server.views.service_root'))