pythonic logic

Author: scivision

src/pymap3d/aer.py

@@ -11,7 +11,7 @@
 try:
     from .eci import eci2ecef, ecef2eci
 except ImportError:
-    eci2ecef = ecef2eci = None  # type: ignore
+    pass
 
 if typing.TYPE_CHECKING:
     from numpy import ndarray
@@ -212,10 +212,11 @@ def eci2aer(
     srange : float
          slant range [meters]
     """
-    if eci2ecef is None:
-        raise ImportError("pip install numpy")
 
-    xecef, yecef, zecef = eci2ecef(x, y, z, t, use_astropy=use_astropy)
+    try:
+        xecef, yecef, zecef = eci2ecef(x, y, z, t, use_astropy=use_astropy)
+    except NameError:
+        raise ImportError("pip install numpy")
 
     return ecef2aer(xecef, yecef, zecef, lat0, lon0, h0, deg=deg)
 
@@ -271,12 +272,13 @@ def aer2eci(
     z : float
         ECEF z coordinate (meters)
     """
-    if ecef2eci is None:
-        raise ImportError("pip install numpy")
 
     x, y, z = aer2ecef(az, el, srange, lat0, lon0, h0, ell, deg=deg)
 
-    return ecef2eci(x, y, z, t, use_astropy=use_astropy)
+    try:
+        return ecef2eci(x, y, z, t, use_astropy=use_astropy)
+    except NameError:
+        raise ImportError("pip install numpy")
 
 
 def aer2ecef(

src/pymap3d/ecef.py

@@ -4,6 +4,7 @@
 
 try:
     from numpy import radians, sin, cos, tan, arctan as atan, hypot, degrees, arctan2 as atan2, sqrt
+    from .eci import eci2ecef, ecef2eci
 except ImportError:
     from math import radians, sin, cos, tan, atan, hypot, degrees, atan2, sqrt  # type: ignore
 
@@ -13,11 +14,6 @@
 from .ellipsoid import Ellipsoid
 from .utils import sanitize
 
-try:
-    from .eci import eci2ecef, ecef2eci
-except ImportError:
-    eci2ecef = ecef2eci = None  # type: ignore
-
 if typing.TYPE_CHECKING:
     from numpy import ndarray
 
@@ -395,10 +391,11 @@ def eci2geodetic(
 
     eci2geodetic() a.k.a. eci2lla()
     """
-    if eci2ecef is None:
-        raise ImportError("pip install numpy")
 
-    xecef, yecef, zecef = eci2ecef(x, y, z, t, use_astropy=use_astropy)
+    try:
+        xecef, yecef, zecef = eci2ecef(x, y, z, t, use_astropy=use_astropy)
+    except NameError:
+        raise ImportError("pip install numpy")
 
     return ecef2geodetic(xecef, yecef, zecef, ell, deg)
 
@@ -446,12 +443,13 @@ def geodetic2eci(
 
     geodetic2eci() a.k.a lla2eci()
     """
-    if ecef2eci is None:
-        raise ImportError("pip install numpy")
 
     x, y, z = geodetic2ecef(lat, lon, alt, ell, deg)
 
-    return ecef2eci(x, y, z, t, use_astropy=use_astropy)
+    try:
+        return ecef2eci(x, y, z, t, use_astropy=use_astropy)
+    except NameError:
+        raise ImportError("pip install numpy")
 
 
 def enu2ecef(