From 9a2f40640d2d278ba0e2f31bc3a0adb52541532e Mon Sep 17 00:00:00 2001 From: Nicola Iarocci Date: Fri, 13 Feb 2015 12:00:10 +0100 Subject: [PATCH] pep8 fixes --- eve/flaskapp.py | 4 ++-- eve/methods/common.py | 2 +- eve/tests/__init__.py | 8 ++++---- eve/tests/auth.py | 4 ++-- eve/tests/endpoints.py | 2 +- eve/tests/methods/patch.py | 4 ++-- eve/tests/test_settings.py | 3 ++- eve/versioning.py | 6 +++--- tox.ini | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/eve/flaskapp.py b/eve/flaskapp.py index 640a07de0..2f1fc944b 100644 --- a/eve/flaskapp.py +++ b/eve/flaskapp.py @@ -632,8 +632,8 @@ def _add_resource_url_rules(self, resource, settings): pretty_url = settings['url'] if '<' in pretty_url: - pretty_url = pretty_url[:pretty_url.index('<')+1] + \ - pretty_url[pretty_url.rindex(':')+1:] + pretty_url = pretty_url[:pretty_url.index('<') + 1] + \ + pretty_url[pretty_url.rindex(':') + 1:] self.config['URLS'][resource] = pretty_url # resource endpoint diff --git a/eve/methods/common.py b/eve/methods/common.py index 910315250..e308003b7 100644 --- a/eve/methods/common.py +++ b/eve/methods/common.py @@ -591,7 +591,7 @@ def resolve_embedded_documents(document, resource, embedded_fields): """ for field in embedded_fields: data_relation = field_definition(resource, field)['data_relation'] - getter = lambda ref: embedded_document(ref, data_relation, field) # noqa + getter = lambda ref: embedded_document(ref, data_relation, field) fields_chain = field.split('.') last_field = fields_chain[-1] for subdocument in subdocuments(fields_chain[:-1], document): diff --git a/eve/tests/__init__.py b/eve/tests/__init__.py index b028af0cd..135686ad3 100644 --- a/eve/tests/__init__.py +++ b/eve/tests/__init__.py @@ -419,7 +419,7 @@ def random_contacts(self, num, standard_date_fields=True): for i in range(num): dt = datetime.now() contact = { - 'ref': self.random_string(schema['ref']['maxlength']), + 'ref': self.random_string(schema['ref']['maxlength']), 'prog': i, 'role': random.choice(schema['role']['allowed']), 'rows': self.random_rows(random.randint(0, 5)), @@ -451,7 +451,7 @@ def random_payments(self, num): for i in range(num): dt = datetime.now() payment = { - 'a_string': self.random_string(10), + 'a_string': self.random_string(10), 'a_number': i, eve.LAST_UPDATED: dt, eve.DATE_CREATED: dt, @@ -464,7 +464,7 @@ def random_invoices(self, num): for _ in range(num): dt = datetime.now() invoice = { - 'inv_number': self.random_string(10), + 'inv_number': self.random_string(10), eve.LAST_UPDATED: dt, eve.DATE_CREATED: dt, } @@ -498,7 +498,7 @@ def random_internal_transactions(self, num): for i in range(num): dt = datetime.now() transaction = { - 'internal_string': self.random_string(10), + 'internal_string': self.random_string(10), 'internal_number': i, eve.LAST_UPDATED: dt, eve.DATE_CREATED: dt, diff --git a/eve/tests/auth.py b/eve/tests/auth.py index bf040779f..139bf5e3c 100644 --- a/eve/tests/auth.py +++ b/eve/tests/auth.py @@ -88,7 +88,7 @@ def test_restricted_item_access(self): self.assert401(r.status_code) def test_authorized_home_access(self): - r = self.test_client.get('/', headers=self.valid_auth) + r = self.test_client.get('/', headers=self.valid_auth) self.assert200(r.status_code) def test_authorized_resource_access(self): @@ -114,7 +114,7 @@ def test_authorized_item_access(self): self.assert403(r.status_code) def test_unauthorized_home_access(self): - r = self.test_client.get('/', headers=self.invalid_auth) + r = self.test_client.get('/', headers=self.invalid_auth) self.assert401(r.status_code) def test_unauthorized_resource_access(self): diff --git a/eve/tests/endpoints.py b/eve/tests/endpoints.py index 7f413175f..d8efa0cb4 100644 --- a/eve/tests/endpoints.py +++ b/eve/tests/endpoints.py @@ -264,7 +264,7 @@ def on_generic_inserted(self, resource, docs): if resource != 'internal_transactions': dt = datetime.now() transaction = { - 'entities': [doc['_id'] for doc in docs], + 'entities': [doc['_id'] for doc in docs], 'original_resource': resource, config.LAST_UPDATED: dt, config.DATE_CREATED: dt, diff --git a/eve/tests/methods/patch.py b/eve/tests/methods/patch.py index 7b8699114..c9ea0bbd7 100644 --- a/eve/tests/methods/patch.py +++ b/eve/tests/methods/patch.py @@ -393,8 +393,8 @@ def test_patch_nested_document_not_overwritten(self): "schema": { "name": {"type": "string"}, "lon": {"type": "float"}, - "lat": {"type": "float"}, - "value": {"type": "float", "default": 10.3}, + "lat": {"type": "float"}, + "value": {"type": "float", "default": 10.3}, "dict": { 'type': 'dict', 'schema': { diff --git a/eve/tests/test_settings.py b/eve/tests/test_settings.py index f665c0690..dae8fbcfc 100644 --- a/eve/tests/test_settings.py +++ b/eve/tests/test_settings.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +import copy + MONGO_HOST = 'localhost' MONGO_PORT = 27017 @@ -124,7 +126,6 @@ } } -import copy users = copy.deepcopy(contacts) users['url'] = 'users' users['datasource'] = {'source': 'contacts', diff --git a/eve/versioning.py b/eve/versioning.py index 34cedb003..46f39bf64 100644 --- a/eve/versioning.py +++ b/eve/versioning.py @@ -9,7 +9,7 @@ def versioned_id_field(): .. versionadded: 0.4 """ - return app.config['ID_FIELD']+app.config['VERSION_ID_SUFFIX'] + return app.config['ID_FIELD'] + app.config['VERSION_ID_SUFFIX'] def resolve_document_version(document, resource, method, latest_doc=None): @@ -138,7 +138,7 @@ def insert_versioning_documents(resource, documents): versioned_documents.append(ver_doc) # bulk insert - app.data.insert(resource+app.config['VERSIONS'], versioned_documents) + app.data.insert(resource + app.config['VERSIONS'], versioned_documents) def versioned_fields(resource_def): @@ -259,7 +259,7 @@ def get_old_document(resource, req, lookup, document, version): lookup[config.VERSION] = version # synthesize old document from latest and delta - delta = app.data.find_one(resource+config.VERSIONS, req, **lookup) + delta = app.data.find_one(resource + config.VERSIONS, req, **lookup) if not delta: abort(404) document = synthesize_versioned_document( diff --git a/tox.ini b/tox.ini index c57e8eeb4..d63476b07 100644 --- a/tox.ini +++ b/tox.ini @@ -6,4 +6,4 @@ commands=python setup.py test {posargs} [testenv:flake8] deps=flake8 -commands=flake8 eve +commands=flake8 --ignore=E731 eve {posargs}