fix further flake8 errors

Author: eguven

.travis.yml

@@ -2,13 +2,16 @@ language: python
 matrix:
   include:
     - python: "2.7"
-      env: NOSE_IGNORE_FILES=test_py3_sugar.py
+      env: NOSE_IGNORE_FILES=test_py3_sugar.py FLAKE8_EXCLUDE_ARG=docs,test_py3_sugar.py
     - python: "3.4"
+      env: FLAKE8_EXCLUDE_ARG=docs
     - python: "3.5"
+      env: FLAKE8_EXCLUDE_ARG=docs
     - python: "3.6"
+      env: FLAKE8_EXCLUDE_ARG=docs
 services: mongodb
 install:
   - pip install -r requirements-test.txt
 script:
-  - "flake8"
+  - "flake8 --exclude ${FLAKE8_EXCLUDE_ARG}"
   - "NANOMONGO_SKIP_MOTOR=1 nosetests"

nanomongo/util.py

@@ -183,7 +183,7 @@ def __getattribute__(self, key):
             return super(DotNotationMixin, self).__getattribute__(key)
         try:
             return self.__getitem__(key)
-        except:
+        except KeyError:
             return
 
         return super(DotNotationMixin, self).__getattribute__(key)

setup.cfg

@@ -1,8 +1,5 @@
 [flake8]
 ignore = E501
-exclude =
-    docs
-
 
 [nosetests]
 verbosity=2

test/__init__.py

@@ -0,0 +1,8 @@
+import pymongo
+
+PYMONGO_CLIENT = pymongo.MongoClient(serverSelectionTimeoutMS=500)
+
+try:
+    PYMONGO_CLIENT.admin.command('ismaster')
+except pymongo.errors.ServerSelectionTimeoutError:
+    PYMONGO_CLIENT = None

test/test_document_motor.py

@@ -13,7 +13,7 @@
 try:
     import motor
     MOTOR_CLIENT = motor.MotorClient()
-except:
+except ImportError:
     MOTOR_CLIENT = None
 
 SKIP_MOTOR = bool(os.environ.get('NANOMONGO_SKIP_MOTOR'))

test/test_field.py

@@ -2,9 +2,8 @@
 import datetime
 import unittest
 
-import six
-
 from bson import DBRef
+import six
 
 from nanomongo.field import Field
 from nanomongo.errors import ValidationError

test/test_py3_sugar.py

@@ -7,7 +7,7 @@
     import pymongo
     pymongo.MongoClient()
     PYMONGO_OK = True
-except:
+except ImportError:
     PYMONGO_OK = False
 
 

test/test_util.py

@@ -1,6 +1,7 @@
 import unittest
 
 from mock import patch
+import pymongo
 
 from nanomongo.field import Field
 from nanomongo.document import BaseDocument
@@ -10,16 +11,12 @@
 )
 from nanomongo.errors import ValidationError
 
-try:
-    import pymongo
-    PYMONGO_CLIENT = pymongo.MongoClient()
-except:
-    PYMONGO_CLIENT = False
+PYMONGO_CLIENT = pymongo.MongoClient()
 
 try:
     import motor
     MOTOR_CLIENT = motor.MotorClient()
-except:
+except ImportError:
     MOTOR_CLIENT = None
 
 

test/test_zexamples.py

@@ -1,14 +1,12 @@
 from __future__ import unicode_literals
-import six
 import unittest
 
+import pymongo
+import six
+
 from examples.example import User, Entry
 
-try:
-    import pymongo
-    PYMONGO_CLIENT = pymongo.MongoClient()
-except:
-    PYMONGO_CLIENT = False
+PYMONGO_CLIENT = pymongo.MongoClient()
 
 
 class HelperFuncionsTestCase(unittest.TestCase):