Style fixes.

Author: lossyrob

Diff for: pystac/__init__.py

@@ -53,7 +53,8 @@ def _stac_object_from_dict(d, href=None, root=None):
             # Dealing with an Item
             if any([k for k in d['properties'].keys() if k.startswith('eo:')]):
                 return EOItem.from_dict(d, href=href, root=root)
-            elif any([k for k in d['properties'].keys() if k.startswith('label:')]):
+            elif any(
+                [k for k in d['properties'].keys() if k.startswith('label:')]):
                 return LabelItem.from_dict(d, href=href, root=root)
             else:
                 return Item.from_dict(d, href=href, root=root)

Diff for: pystac/catalog.py

@@ -1,11 +1,9 @@
 import os
-import json
 from copy import deepcopy
 
 import pystac
 from pystac import (STAC_VERSION, STACError)
 from pystac.stac_object import STACObject
-from pystac.stac_io import STAC_IO
 from pystac.link import (Link, LinkType)
 from pystac.resolved_object_cache import ResolvedObjectCache
 from pystac.utils import (is_absolute_href, make_absolute_href)
@@ -125,7 +123,8 @@ def add_item(self, item, title=None):
 
         # Prevent typo confusion
         if isinstance(item, pystac.Catalog):
-            raise STACError('Cannot add catalog as item. Use add_child instead.')
+            raise STACError(
+                'Cannot add catalog as item. Use add_child instead.')
 
         item.set_root(self.get_root())
         item.set_parent(self)

Diff for: pystac/collection.py

@@ -1,13 +1,10 @@
-import json
 from datetime import datetime
 import dateutil.parser
 from copy import (copy, deepcopy)
 
 from pystac import STACError
 from pystac.catalog import Catalog
-from pystac.link import (Link, LinkType)
-from pystac.stac_io import STAC_IO
-from pystac.utils import (make_absolute_href, is_absolute_href)
+from pystac.link import Link
 
 
 class Collection(Catalog):
@@ -209,12 +206,12 @@ def from_dict(d):
         # Handle pre-0.8 spatial extents
         spatial_extent_dict = d['spatial']
         if isinstance(spatial_extent_dict, list):
-            spatial_extent_dict = { 'bbox': [spatial_extent_dict] }
+            spatial_extent_dict = {'bbox': [spatial_extent_dict]}
 
         # Handle pre-0.8 temporal extents
         temporal_extent_dict = d['temporal']
         if isinstance(temporal_extent_dict, list):
-            temporal_extent_dict = { 'interval': [temporal_extent_dict] }
+            temporal_extent_dict = {'interval': [temporal_extent_dict]}
 
         return Extent(SpatialExtent.from_dict(spatial_extent_dict),
                       TemporalExtent.from_dict(temporal_extent_dict))

Diff for: pystac/item.py

@@ -1,12 +1,10 @@
-import json
 import os
 from copy import copy, deepcopy
 from collections import ChainMap
 
 import dateutil.parser
 
 from pystac import (STAC_VERSION, STACError)
-from pystac.stac_io import STAC_IO
 from pystac.link import Link, LinkType
 from pystac.stac_object import STACObject
 from pystac.utils import (is_absolute_href, make_absolute_href,
@@ -269,7 +267,8 @@ def from_dict(cls, d, href=None, root=None):
         # common properties to merge.
         collection_to_merge = None
         if collection_id is not None and root is not None:
-            collection_to_merge = root._resolved_objects.get_by_id(collection_id)
+            collection_to_merge = root._resolved_objects.get_by_id(
+                collection_id)
         else:
             collection_link = item.get_single_link('collection')
             if collection_link is not None:
@@ -280,22 +279,21 @@ def from_dict(cls, d, href=None, root=None):
                    not collection_link.is_resolved():
                     if href is not None:
                         collection_link = collection_link.clone()
-                        collection_link.target = make_absolute_href(collection_link.target,
-                                                                    href)
+                        collection_link.target = make_absolute_href(
+                            collection_link.target, href)
                     else:
                         collection_link = None
 
                 if collection_link is not None:
-                    collection_to_merge = collection_link.resolve_stac_object(root=root).target
+                    collection_to_merge = collection_link.resolve_stac_object(
+                        root=root).target
                     if item.collection_id is None:
                         item.collection_id = collection_to_merge.id
 
         if collection_to_merge is not None:
             if collection_to_merge.properties is not None:
                 item.properties = dict(
-                    ChainMap(
-                        item.properties,
-                        collection_to_merge.properties))
+                    ChainMap(item.properties, collection_to_merge.properties))
 
         return item
 

Diff for: pystac/label.py

@@ -1,13 +1,10 @@
 """STAC Model classes for Label extension.
 """
-import json
 from copy import (copy, deepcopy)
 
 from pystac import STACError
-from pystac.stac_io import STAC_IO
 from pystac.item import (Item, Asset)
 from pystac.link import Link
-from pystac.utils import (is_absolute_href, make_absolute_href)
 
 
 class LabelType:
@@ -178,7 +175,6 @@ def get_sources(self):
         """
         return self.get_stac_objects('source')
 
-
     def add_labels(self, href, title=None, media_type=None, properties=None):
         """Adds a label asset to this LabelItem.
 
@@ -192,11 +188,12 @@ def add_labels(self, href, title=None, media_type=None, properties=None):
                 object JSON.
         """
 
-        self.add_asset("labels",
-                       Asset(href=href,
-                             title=title,
-                             media_type=media_type,
-                             properties=properties))
+        self.add_asset(
+            "labels",
+            Asset(href=href,
+                  title=title,
+                  media_type=media_type,
+                  properties=properties))
 
     def add_geojson_labels(self, href, title=None, properties=None):
         """Adds a GeoJSON label asset to this LabelItem.

Diff for: pystac/stac_object.py

@@ -321,7 +321,8 @@ def fully_resolve(self):
         link_rels = set(self._object_links())
         for link in self.links:
             if link.rel == 'root':
-                if not link.is_resolved() and not link.target == self.get_self_href():
+                if not link.is_resolved(
+                ) and not link.target == self.get_self_href():
                     link.resolve_stac_object()
                     link.target.fully_resolve()
             if link.rel in link_rels:
@@ -411,7 +412,6 @@ def from_file(cls, href):
                 o.set_root(o, link_type=root_link.link_type)
         return o
 
-
     @classmethod
     @abstractmethod
     def from_dict(cls, d, href=None, root=None):

Diff for: tests/__init__.py

@@ -7,6 +7,7 @@
 # Set the STAC_IO read method to read HTTP.
 # Skip SSL Certification because it fails on some machines.
 
+
 def unsafe_read_https_method(uri):
     parsed = urlparse(uri)
     if parsed.scheme == 'https':

Diff for: tests/test_catalog.py

@@ -82,7 +82,8 @@ def item_mapper(item):
                 os.path.join(tmp_dir, 'cat', 'catalog.json'))
             result_items = result_cat.get_all_items()
 
-            self.assertEqual(len(list(catalog_items)) * 2, len(list(result_items)))
+            self.assertEqual(
+                len(list(catalog_items)) * 2, len(list(result_items)))
 
             ones, twos = 0, 0
             for item in result_items:
@@ -109,7 +110,8 @@ def test_map_items_multiple_2(self):
                      properties={})
         item1.add_asset('ortho', Asset(href='/some/ortho.tif'))
         catalog.add_item(item1)
-        kitten = Catalog(id='test-kitten', description='A cuter version of catalog')
+        kitten = Catalog(id='test-kitten',
+                         description='A cuter version of catalog')
         catalog.add_child(kitten)
         item2 = Item(id='item2',
                      geometry=RANDOM_GEOM,
@@ -129,24 +131,23 @@ def create_label_item(item):
             img_href = item.assets['ortho'].href
             label_href = '{}.geojson'.format(os.path.splitext(img_href)[0])
             label_item = LabelItem(id='Labels',
-                              geometry=item.geometry,
-                              bbox=item.bbox,
-                              datetime=datetime.utcnow(),
-                              properties={},
-                              label_description='labels',
-                              label_type='vector',
-                              label_properties='label',
-                              label_classes=[
-                              LabelClasses(classes=['one', 'two'],
-                                           name='label')
-                              ],
-                              label_tasks=['classification'])
+                                   geometry=item.geometry,
+                                   bbox=item.bbox,
+                                   datetime=datetime.utcnow(),
+                                   properties={},
+                                   label_description='labels',
+                                   label_type='vector',
+                                   label_properties='label',
+                                   label_classes=[
+                                       LabelClasses(classes=['one', 'two'],
+                                                    name='label')
+                                   ],
+                                   label_tasks=['classification'])
             label_item.add_source(item, assets=['ortho'])
             label_item.add_geojson_labels(label_href)
 
             return [item, label_item]
 
-
         c = catalog.map_items(modify_item_title)
         c = c.map_items(create_label_item)
         new_catalog = c
@@ -340,29 +341,29 @@ def test_set_hrefs_manually(self):
 
                 # Set each item's HREF based on it's datetime
                 for item in items:
-                    item_href = '{}/{}-{}/{}.json'.format(root_dir,
-                                                          item.datetime.year,
-                                                          item.datetime.month,
-                                                          item.id)
+                    item_href = '{}/{}-{}/{}.json'.format(
+                        root_dir, item.datetime.year, item.datetime.month,
+                        item.id)
                     item.set_self_href(item_href)
 
             catalog.save(catalog_type=CatalogType.SELF_CONTAINED)
 
-            read_catalog = Catalog.from_file(os.path.join(tmp_dir, 'catalog.json'))
+            read_catalog = Catalog.from_file(
+                os.path.join(tmp_dir, 'catalog.json'))
 
             for root, _, items in read_catalog.walk():
                 parent = root.get_parent()
                 if parent is None:
-                    self.assertEqual(root.get_self_href(), os.path.join(tmp_dir, 'catalog.json'))
+                    self.assertEqual(root.get_self_href(),
+                                     os.path.join(tmp_dir, 'catalog.json'))
                 else:
                     d = os.path.dirname(parent.get_self_href())
-                    self.assertEqual(root.get_self_href(), os.path.join(d,
-                                                                        root.id,
-                                                                        root.DEFAULT_FILE_NAME))
+                    self.assertEqual(
+                        root.get_self_href(),
+                        os.path.join(d, root.id, root.DEFAULT_FILE_NAME))
                 for item in items:
                     end = '{}-{}/{}.json'.format(item.datetime.year,
-                                                 item.datetime.month,
-                                                 item.id)
+                                                 item.datetime.month, item.id)
                     self.assertTrue(item.get_self_href().endswith(end))