Commit 96e9c423 authored by Jay's avatar Jay
Browse files

Update with different exception throwing logic

parent 3d1757e1

autocnet/spatial/isis.py

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,9 +18,9 @@ import numpy as np 




try:

try:

    import kalasiris as isis

    import kalasiris as isis

except:

except Exception as exception:

    from autocnet.utils.utils import FailedImport

    from autocnet.utils.utils import FailedImport

    isis = FailedImport()

    isis = FailedImport(exception)





import pvl

import pvl

autocnet/spatial/tests/test_isis.py

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,9 +18,9 @@ import numpy.testing as npt 




try:

try:

    import kalasiris as isis

    import kalasiris as isis

except:

except Exception as exception:

    from autocnet.utils.utils import FailedImport

    from autocnet.utils.utils import FailedImport

    isis = FailedImport()

    isis = FailedImport(exception)





from autocnet.spatial import isis as si

from autocnet.spatial import isis as si

autocnet/utils/utils.py

+4 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,10 @@ from shapely.ops import cascaded_union, polygonize 








class FailedImport():

class FailedImport():

    def __getattribute__(self, name: str):

    def __init__(self, exception):

        raise ImportError('Module was not imported. No classes, attributes, or variables are available.')

        self.exception = exception

    def __getattr__(self, name: str):

        raise self.exception





def tile(array_size, tilesize=1000, overlap=500):

def tile(array_size, tilesize=1000, overlap=500):

    stepsize = tilesize - overlap

    stepsize = tilesize - overlap