Merge pull request #96 from planetlabs/flake8-2.5.4-fixes

flake8 2.5.4 fixes

planet/api/models.py

@@ -117,7 +117,9 @@ def get_raw(self):
     def _write(self, fp, callback):
         total = 0
         if not callback:
-            callback = lambda x: None
+            def noop(x):
+                pass
+            callback = noop
         callback(self)
         for chunk in self:
             if self._cancel:

tests/test_atomic.py

@@ -17,7 +17,9 @@
 
 def test_atomic_open(tmpdir):
     outfile = str(tmpdir.join('foo'))
-    lsdir = lambda: os.listdir(str(tmpdir))
+
+    def lsdir():
+        return os.listdir(str(tmpdir))
 
     def assert_content_is(expected):
         with open(outfile, 'r') as fp:

tests/test_cli.py

@@ -81,12 +81,12 @@ def stdin(content):
 
 def test_read(tmpdir):
     # no special files in arguments, expect what's been passed in
-    assert None == scripts.read(None)
+    assert None is scripts.read(None)
     assert 'foo' == scripts.read('foo')
     assert (1,) == scripts.read((1,))
 
     # same but with split
-    assert None == scripts.read(None, split=True)
+    assert None is scripts.read(None, split=True)
     assert ['foo'] == scripts.read('foo', split=True)
     assert (1,) == scripts.read((1,), split=True)
 

tests/test_utils.py

@@ -18,10 +18,10 @@
 
 def test_geometry_from_json():
     # base case, no geometry
-    assert None == utils.geometry_from_json({})
+    assert None is utils.geometry_from_json({})
     # from an empty feature collection
     collection = {'type': 'FeatureCollection', 'features': []}
-    assert None == utils.geometry_from_json(collection)
+    assert None is utils.geometry_from_json(collection)
 
     # simple geometry, we're guessing by the type property w/ no further checks
     geom = {'type': 'Polygon'}