Fixed pylint 1.8.1 warnings

- Disabled ‘keyword-arg-before-vararg’ pylint warning
- Removed return statement to fix pylint ‘inconsistent-return-statements’
- Revert pinned pylint 1.7.4 and astroid 1.5.3
- Replaced StopIteration with return

Author: emlaver

pylintrc

@@ -66,7 +66,7 @@ confidence=
 # Disable "redefined-variable-type" refactor warning messages
 # Disable "too-many-..." and "too-few-..." refactor warning messages
 # Disable "locally-disabled" message
-disable=R0204,R0901,R0902,R0903,R0904,R0913,R0914,R0915,locally-disabled
+disable=R0204,R0901,R0902,R0903,R0904,R0913,R0914,R0915,locally-disabled,keyword-arg-before-vararg
 
 
 [REPORTS]

src/cloudant/database.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2015 IBM. All rights reserved.
+# Copyright (C) 2015, 2018 IBM Corp. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -660,7 +660,7 @@ def __iter__(self, remote=True):
                     super(CouchDatabase, self).__setitem__(doc['id'], document)
                     yield document
 
-            raise StopIteration
+            return
 
     def bulk_docs(self, docs):
         """

src/cloudant/document.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2015 IBM. All rights reserved.
+# Copyright (C) 2015, 2018 IBM Corp. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -257,7 +257,7 @@ def _update_field(self, action, field, value, max_tries, tries=0):
             self.save()
         except requests.HTTPError as ex:
             if tries < max_tries and ex.response.status_code == 409:
-                return self._update_field(
+                self._update_field(
                     action, field, value, max_tries, tries=tries+1)
             raise
 

src/cloudant/replicator.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2015 IBM. All rights reserved.
+# Copyright (C) 2015, 2018 IBM Corp. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -158,7 +158,7 @@ def update_state():
             if repl_doc:
                 yield repl_doc
             if state is not None and state in ['error', 'completed']:
-                raise StopIteration
+                return
 
             # Now listen on changes feed for the state
             for change in self.database.changes():
@@ -167,7 +167,7 @@ def update_state():
                     if repl_doc is not None:
                         yield repl_doc
                     if state is not None and state in ['error', 'completed']:
-                        raise StopIteration
+                        return
 
     def stop_replication(self, repl_id):
         """

test-requirements.txt

@@ -1,6 +1,5 @@
 mock==1.3.0
 nose
 sphinx
-pylint==1.7.4
-astroid==1.5.3
+pylint
 flaky