pygeodesy 24.5.6__py2.py3-none-any.whl → 24.5.15__py2.py3-none-any.whl

pygeodesy/basics.py

@@ -19,28 +19,27 @@ del division
 from pygeodesy.errors import _AttributeError, _ImportError, _NotImplementedError, \
                              _TypeError, _TypesError, _ValueError, _xAssertionError, \
                              _xkwds_get
+from pygeodesy.internals import _0_0, _enquote, _passarg, _version_info
 from pygeodesy.interns import MISSING, NN, _1_, _by_, _COMMA_, _DOT_, _DEPRECATED_, \
-                             _ELLIPSIS4_, _enquote, _EQUAL_, _in_, _invalid_, _N_A_, \
-                             _not_scalar_, _SPACE_, _UNDER_, _version_, _version_info
+                             _ELLIPSIS4_, _EQUAL_, _in_, _invalid_, _N_A_, _not_, \
+                             _not_scalar_, _odd_, _SPACE_, _UNDER_, _version_
 # from pygeodesy.latlonBase import LatLonBase  # _MODS
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS, \
-                             _getenv, LazyImportError, _sys, _sys_version_info2
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS, _getenv, \
+                             LazyImportError, _sys_version_info2
 # from pygeodesy.named import classname, modulename  # _MODS
 # from pygeodesy.nvectorBase import NvectorBase  # _MODS
 # from pygeodesy.props import _update_all  # _MODS
+# from pygeodesy.streprs import Fmt  # _MODS
 
 from copy import copy as _copy, deepcopy as _deepcopy
 from math import copysign as _copysign
 import inspect as _inspect
 
 __all__ = _ALL_LAZY.basics
-__version__ = '24.04.28'
+__version__ = '24.05.15'
 
-_0_0                  =  0.0  # in .constants
 _below_               = 'below'
 _list_tuple_types     = (list, tuple)
-_list_tuple_set_types = (list, tuple, set)
-_odd_                 = 'odd'
 _PYGEODESY_XPACKAGES_ = 'PYGEODESY_XPACKAGES'
 _required_            = 'required'
 
@@ -51,7 +50,7 @@ except ImportError:
         _Ints = int, long  # int objects (C{tuple})
     except NameError:  # Python 3+
         _Ints = int,  # int objects (C{tuple})
-    _Scalars = _Ints + (float,)
+    _Scalars = (float,) + _Ints
 
 try:
     try:  # use C{from collections.abc import ...} in Python 3.9+
@@ -67,19 +66,6 @@ except ImportError:
     _Sequence = tuple  # immutable for .points._Basequence
     _Seqs     = list, _Sequence  # range for function len2 below
 
-
-def _passarg(arg):  # in .auxilats.auxLat
-    '''(INTERNAL) Helper, no-op.
-    '''
-    return arg
-
-
-def _passargs(*args):  # in .utily
-    '''(INTERNAL) Helper, no-op.
-    '''
-    return args
-
-
 try:
     _Bytes = unicode, bytearray  # PYCHOK expected
     _Strs  = basestring, str  # XXX , bytes
@@ -202,41 +188,28 @@ def int1s(x):
 
 
 def isbool(obj):
-    '''Check whether an object is C{bool}ean.
+    '''Is B{C{obj}}ect a C{bool}ean?
 
        @arg obj: The object (any C{type}).
 
-       @return: C{True} if B{C{obj}} is C{bool}ean,
-                C{False} otherwise.
+       @return: C{True} if C{bool}ean, C{False} otherwise.
     '''
     return isinstance(obj, bool)  # and (obj is False
 #                                     or obj is True)
 
 assert not (isbool(1) or isbool(0) or isbool(None))  # PYCHOK 2
 
-if _FOR_DOCS:  # XXX avoid epydoc Python 2.7 error
-
-    def isclass(obj):
-        '''Return C{True} if B{C{obj}} is a C{class} or C{type}.
-
-           @see: Python's C{inspect.isclass}.
-        '''
-        return _inspect.isclass(obj)
-else:
-    isclass = _inspect.isclass
-
 
 def isCartesian(obj, ellipsoidal=None):
-    '''Is B{C{obj}} some C{Cartesian}?
+    '''Is B{C{obj}}ect some C{Cartesian}?
 
        @arg obj: The object (any C{type}).
        @kwarg ellipsoidal: If C{None}, return the type of any C{Cartesian},
                            if C{True}, only an ellipsoidal C{Cartesian type}
                            or if C{False}, only a spherical C{Cartesian type}.
 
-       @return: C{type(B{obj}} if B{C{obj}} is a C{Cartesian} instance of
-                the required type, C{False} if a C{Cartesian} of an other
-                type or C{None} otherwise.
+       @return: C{type(B{obj}} if a C{Cartesian} of the required type, C{False}
+                if a C{Cartesian} of an other type or {None} otherwise.
     '''
     if ellipsoidal is not None:
         try:
@@ -246,42 +219,55 @@ def isCartesian(obj, ellipsoidal=None):
     return isinstanceof(obj, _MODS.cartesianBase.CartesianBase)
 
 
-def iscomplex(obj):
-    '''Check whether an object is a C{complex} or complex C{str}.
+if _FOR_DOCS:  # XXX avoid epydoc Python 2.7 error
+
+    def isclass(obj):
+        '''Is B{C{obj}}ect a C{Class} or C{type}?
+        '''
+        return _inspect.isclass(obj)
+else:
+    isclass = _inspect.isclass
+
+
+def iscomplex(obj, both=False):
+    '''Is B{C{obj}}ect a C{complex} or complex literal C{str}?
 
        @arg obj: The object (any C{type}).
+       @kwarg both: If C{True}, check complex C{str} (C{bool}).
 
-       @return: C{True} if B{C{obj}} is C{complex}, otherwise
-                C{False}.
+       @return: C{True} if C{complex}, C{False} otherwise.
     '''
-    try:  # hasattr('conjugate'), hasattr('real') and hasattr('imag')
-        return isinstance(obj,          complex) or (isstr(obj)
-           and isinstance(complex(obj), complex))  # numbers.Complex?
+    try:  # hasattr('conjugate', 'real' and 'imag')
+        return isinstance(obj, complex) or bool(both and isstr(obj) and
+               isinstance(complex(obj), complex))  # numbers.Complex?
     except (TypeError, ValueError):
         return False
 
 
 def isDEPRECATED(obj):
-    '''Return C{True} if C{B{obj}} is a C{DEPRECATED} class, method
-       or function, C{False} if not or C{None} if undetermined.
+    '''Is B{C{obj}}ect a C{DEPRECATED} class, method or function?
+
+       @return: C{True} if C{DEPRECATED}, {False} if not or
+                C{None} if undetermined.
     '''
-    try:  # XXX inspect.getdoc(obj)
-        return bool(obj.__doc__.lstrip().startswith(_DEPRECATED_))
+    try:  # XXX inspect.getdoc(obj) or obj.__doc__
+        doc = obj.__doc__.lstrip()
+        return bool(doc and doc.startswith(_DEPRECATED_))
     except AttributeError:
         return None
 
 
-def isfloat(obj):
-    '''Check whether an object is a C{float} or float C{str}.
+def isfloat(obj, both=False):
+    '''Is B{C{obj}}ect a C{float} or float literal C{str}?
 
        @arg obj: The object (any C{type}).
+       @kwarg both: If C{True}, check float C{str} (C{bool}).
 
-       @return: C{True} if B{C{obj}} is a C{float}, otherwise
-                C{False}.
+       @return: C{True} if C{float}, C{False} otherwise.
     '''
     try:
-        return isinstance(      obj,  float) or (isstr(obj)
-           and isinstance(float(obj), float))
+        return isinstance(obj, float) or bool(both and
+               isstr(obj) and isinstance(float(obj), float))
     except (TypeError, ValueError):
         return False
 
@@ -291,40 +277,40 @@ try:
 except AttributeError:  # Python 2-
 
     def isidentifier(obj):
-        '''Return C{True} if B{C{obj}} is a Python identifier.
+        '''Is B{C{obj}}ect a Python identifier?
         '''
         return bool(obj and isstr(obj)
                         and obj.replace(_UNDER_, NN).isalnum()
                         and not obj[:1].isdigit())
 
 
-def isinstanceof(obj, *classes):
-    '''Is B{C{ob}} an instance of one of the C{classes}?
+def isinstanceof(obj, *Classes):
+    '''Is B{C{obj}}ect an instance of one of the C{Classes}?
 
-       @arg obj: The instance (any C{type}).
-       @arg classes: One or more classes (C{class}).
+       @arg obj: The object (any C{type}).
+       @arg Classes: One or more classes (C{Class}).
 
-       @return: C{type(B{obj}} if B{C{obj}} is an instance
-                of the B{C{classes}}, C{None} otherwise.
+       @return: C{type(B{obj}} if one of the B{C{Classes}},
+                C{None} otherwise.
     '''
-    return type(obj) if isinstance(obj, classes) else None
+    return type(obj) if isinstance(obj, Classes) else None
 
 
 def isint(obj, both=False):
-    '''Check for C{int} type or an integer C{float} value.
+    '''Is B{C{obj}}ect an C{int} or integer C{float} value?
 
        @arg obj: The object (any C{type}).
-       @kwarg both: If C{true}, check C{float} and L{Fsum}
+       @kwarg both: If C{True}, check C{float} and L{Fsum}
                     type and value (C{bool}).
 
-       @return: C{True} if B{C{obj}} is C{int} or I{integer}
-                C{float} or L{Fsum}, C{False} otherwise.
+       @return: C{True} if C{int} or I{integer} C{float}
+                or L{Fsum}, C{False} otherwise.
 
        @note: Both C{isint(True)} and C{isint(False)} return
               C{False} (and no longer C{True}).
     '''
-    if isinstance(obj, _Ints) and not isbool(obj):
-        return True
+    if isinstance(obj, _Ints):
+        return not isbool(obj)
     elif both:  # and isinstance(obj, (float, Fsum))
         try:  # NOT , _Scalars) to include Fsum!
             return obj.is_integer()
@@ -333,6 +319,27 @@ def isint(obj, both=False):
     return False
 
 
+def isiterable(obj):
+    '''Is B{C{obj}}ect C{iterable}?
+
+       @arg obj: The object (any C{type}).
+
+       @return: C{True} if C{iterable}, C{False} otherwise.
+    '''
+    # <https://PyPI.org/project/isiterable/>
+    return hasattr(obj, '__iter__')  # map, range, set
+
+
+def isiterablen(obj):
+    '''Is B{C{obj}}ect C{iterable} and has C{len}gth?
+
+       @arg obj: The object (any C{type}).
+
+       @return: C{True} if C{iterable} with C{len}gth, C{False} otherwise.
+    '''
+    return hasattr(obj, '__len__') and hasattr(obj, '__getitem__')
+
+
 try:
     from keyword import iskeyword  # Python 2.7+
 except ImportError:
@@ -344,16 +351,15 @@ except ImportError:
 
 
 def isLatLon(obj, ellipsoidal=None):
-    '''Is B{C{obj}} some C{LatLon}?
+    '''Is B{C{obj}}ect some C{LatLon}?
 
        @arg obj: The object (any C{type}).
        @kwarg ellipsoidal: If C{None}, return the type of any C{LatLon},
                            if C{True}, only an ellipsoidal C{LatLon type}
                            or if C{False}, only a spherical C{LatLon type}.
 
-       @return: C{type(B{obj}} if B{C{obj}} is a C{LatLon} instance of
-                the required type, C{False} if a C{LatLon} of an other
-                type or {None} otherwise.
+       @return: C{type(B{obj}} if a C{LatLon} of the required type, C{False}
+                if a C{LatLon} of an other type or {None} otherwise.
     '''
     if ellipsoidal is not None:
         try:
@@ -364,28 +370,27 @@ def isLatLon(obj, ellipsoidal=None):
 
 
 def islistuple(obj, minum=0):
-    '''Check for list or tuple C{type} with a minumal length.
+    '''Is B{C{obj}}ect a C{list} or C{tuple} with non-zero length?
 
        @arg obj: The object (any C{type}).
        @kwarg minum: Minimal C{len} required C({int}).
 
-       @return: C{True} if B{C{obj}} is C{list} or C{tuple} with
-                C{len} at least B{C{minum}}, C{False} otherwise.
+       @return: C{True} if a C{list} or C{tuple} with C{len} at
+                least B{C{minum}}, C{False} otherwise.
     '''
     return isinstance(obj, _list_tuple_types) and len(obj) >= minum
 
 
 def isNvector(obj, ellipsoidal=None):
-    '''Is B{C{obj}} some C{Nvector}?
+    '''Is B{C{obj}}ect some C{Nvector}?
 
        @arg obj: The object (any C{type}).
        @kwarg ellipsoidal: If C{None}, return the type of any C{Nvector},
                            if C{True}, only an ellipsoidal C{Nvector type}
                            or if C{False}, only a spherical C{Nvector type}.
 
-       @return: C{type(B{obj}} if B{C{obj}} is an C{Nvector} instance of
-                the required type, C{False} if an C{Nvector} of an other
-                type or {None} otherwise.
+       @return: C{type(B{obj}} if an C{Nvector} of the required type, C{False}
+                if an C{Nvector} of an other type or {None} otherwise.
     '''
     if ellipsoidal is not None:
         try:
@@ -400,55 +405,63 @@ def isodd(x):
 
        @arg x: Value (C{scalar}).
 
-       @return: C{True} if B{C{x}} is odd,
-                C{False} otherwise.
+       @return: C{True} if odd, C{False} otherwise.
     '''
     return bool(int(x) & 1)  # == bool(int(x) % 2)
 
 
-def isscalar(obj):
-    '''Check for scalar types.
+def isscalar(obj, both=False):
+    '''Is B{C{obj}}ect an C{int} or integer C{float} value?
 
        @arg obj: The object (any C{type}).
+       @kwarg both: If C{True}, check L{Fsum<Fsum.residual>}.
 
-       @return: C{True} if B{C{obj}} is C{scalar}, C{False} otherwise.
+       @return: C{True} if C{int}, C{float} or L{Fsum} with
+                zero residual, C{False} otherwise.
     '''
-    return isinstance(obj, _Scalars) and not isbool(obj)
+    if isinstance(obj, _Scalars):
+        return not isbool(obj)
+    elif both:  # and isinstance(obj, Fsum)
+        try:
+            return bool(obj.residual == 0)
+        except (AttributeError, TypeError):
+            pass  # XXX float(int(obj)) == obj?
+    return False
 
 
 def issequence(obj, *excls):
-    '''Check for sequence types.
+    '''Is B{C{obj}}ect some sequence type?
 
        @arg obj: The object (any C{type}).
        @arg excls: Classes to exclude (C{type}), all positional.
 
        @note: Excluding C{tuple} implies excluding C{namedtuple}.
 
-       @return: C{True} if B{C{obj}} is a sequence, C{False} otherwise.
+       @return: C{True} if a sequence, C{False} otherwise.
     '''
     return isinstance(obj, _Seqs) and not (excls and isinstance(obj, excls))
 
 
 def isstr(obj):
-    '''Check for string types.
+    '''Is B{C{obj}}ect some string type?
 
        @arg obj: The object (any C{type}).
 
-       @return: C{True} if B{C{obj}} is C{str}, C{False} otherwise.
+       @return: C{True} if a C{str}, C{bytes}, ...,
+                C{False} otherwise.
     '''
     return isinstance(obj, _Strs)
 
 
 def issubclassof(Sub, *Supers):
-    '''Check whether a class is a sub-class of some other class(es).
+    '''Is B{C{Sub}} a class and sub-class of some other class(es)?
 
-       @arg Sub: The sub-class (C{class}).
-       @arg Supers: One or more C(super) classes (C{class}).
+       @arg Sub: The sub-class (C{Class}).
+       @arg Supers: One or more C(super) classes (C{Class}).
 
-       @return: C{True} if B{C{Sub}} is a sub-class of any B{C{Supers}},
-                C{False} if not (C{bool}) or C{None} if B{C{Sub}} is not
-                a class or if no B{C{Supers}} are given or none of those
-                are a class.
+       @return: C{True} if a sub-class of any B{C{Supers}}, C{False}
+                if not (C{bool}) or C{None} if not a class or if no
+                B{C{Supers}} are given or none of those are a class.
     '''
     if isclass(Sub):
         t = tuple(S for S in Supers if isclass(S))
@@ -463,20 +476,19 @@ def itemsorted(adict, *items_args, **asorted_reverse):
 
        @arg items_args: Optional positional argument(s) for method
                         C{B{adict}.items(B*{items_args})}.
-       @kwarg asorted_reverse: Use keyword argument C{B{asorted}=False}
-                      for I{alphabetical, case-sensitive} sorting and
-                      C{B{reverse}=True} for sorting in C{descending}
-                      order.
+       @kwarg asorted_reverse: Use C{B{asorted}=False} for I{alphabetical,
+                      case-sensitive} sorting and C{B{reverse}=True} for
+                      sorting in C{descending} order.
     '''
-    def _ins(item):
-        return item[0].lower()
+    def _ins(item):  # functools.cmp_to_key
+        k, v = item
+        return k.lower()
 
-    def _key_rev(asorted=True, reverse=False):
-        return (_ins if asorted else None), reverse
+    def _reverse_key(asorted=True, reverse=False):
+        return dict(reverse=reverse, key=_ins if asorted else None)
 
-    key, rev = _key_rev(**asorted_reverse)
     items = adict.items(*items_args) if items_args else adict.items()
-    return sorted(items, reverse=rev, key=key)
+    return sorted(items, **_reverse_key(**asorted_reverse))
 
 
 def len2(items):
@@ -494,8 +506,8 @@ def len2(items):
 
 
 def map1(fun1, *xs):  # XXX map_
-    '''Apply a single-argument function to each B{C{xs}} and
-       return a C{tuple} of results.
+    '''Call a single-argument function to each B{C{xs}}
+       and return a C{tuple} of results.
 
        @arg fun1: 1-Arg function (C{callable}).
        @arg xs: Arguments (C{any positional}).
@@ -506,7 +518,7 @@ def map1(fun1, *xs):  # XXX map_
 
 
 def map2(fun, *xs):
-    '''Apply a function to arguments and return a C{tuple} of results.
+    '''Like Python's B{C{map}} but returning a C{tuple} of results.
 
        Unlike Python 2's built-in L{map}, Python 3+ L{map} returns a
        L{map} object, an iterator-like object which generates the
@@ -514,7 +526,7 @@ def map2(fun, *xs):
        maintains the Python 2 behavior.
 
        @arg fun: Function (C{callable}).
-       @arg xs: Arguments (C{list, tuple, ...}).
+       @arg xs: Arguments (C{all positional}).
 
        @return: Function results (C{tuple}).
     '''
@@ -531,8 +543,11 @@ def neg(x, neg0=None):
 
        @return: C{-B{x} if B{x} else 0.0, NEG0 or B{x}}.
     '''
-    return (-x) if x else (_0_0 if neg0 is None else (x if not neg0 else
-                          (_0_0 if signBit(x) else _MODS.constants.NEG0)))
+    return (-x) if x else (
+           _0_0 if neg0 is None else (
+             x  if not neg0 else (
+           _0_0 if signBit(x) else _MODS.constants.
+           NEG0)))  # PYCHOK indent
 
 
 def neg_(*xs):
@@ -587,48 +602,10 @@ def signOf(x):
     try:
         s = x.signOf()  # Fsum instance?
     except AttributeError:
-        s = _signOf(x, 0)
+        s =  _signOf(x, 0)
     return s
 
 
-def _sizeof(inst):
-    '''(INTERNAL) Recursively size an C{inst}ance.
-
-       @return: Instance' size in bytes (C{int}),
-                ignoring class attributes and
-                counting duplicates only once or
-                C{None}.
-
-       @note: With C{PyPy}, the size is always C{None}.
-    '''
-    try:
-        _zB = _sys.getsizeof
-        _zD = _zB(None)  # get some default
-    except TypeError:  # PyPy3.10
-        return None
-
-    def _zR(s, iterable):
-        z, _s = 0, s.add
-        for o in iterable:
-            i = id(o)
-            if i not in s:
-                _s(i)
-                z += _zB(o, _zD)
-                if isinstance(o, dict):
-                    z += _zR(s, o.keys())
-                    z += _zR(s, o.values())
-                elif isinstance(o, _list_tuple_set_types):
-                    z += _zR(s, o)
-                else:
-                    try:  # size instance' attr values only
-                        z += _zR(s, o.__dict__.values())
-                    except AttributeError:  # None, int, etc.
-                        pass
-        return z
-
-    return _zR(set(), (inst,))
-
-
 def splice(iterable, n=2, **fill):
     '''Split an iterable into C{n} slices.
 
@@ -669,9 +646,9 @@ def splice(iterable, n=2, **fill):
     if not isint(n):
         raise _TypeError(n=n)
 
-    t = iterable
+    t = _xiterablen(iterable)
     if not isinstance(t, _list_tuple_types):
-        t = tuple(t)  # force tuple, also for PyPy3
+        t = tuple(t)
 
     if n > 1:
         if fill:
@@ -679,12 +656,12 @@ def splice(iterable, n=2, **fill):
             if fill is not MISSING:
                 m = len(t) % n
                 if m > 0:  # same type fill
-                    t += type(t)((fill,) * (n - m))
+                    t = t + type(t)((fill,) * (n - m))
         for i in range(n):
             # XXX t[i::n] chokes PyChecker
             yield t[slice(i, None, n)]
     else:
-        yield t
+        yield t  # 1 slice, all
 
 
 def _splituple(strs, *sep_splits):  # in .mgrs, .osgr, .webmercator
@@ -778,12 +755,23 @@ def _xinstanceof(*Types, **names_values):
             raise _TypesError(n, v, *Types)
 
 
-def _xisscalar(**names_values):
-    '''(INTERNAL) Check all C{name=value} pairs to be C{scalar}.
+def _xiterable(obj):
+    '''(INTERNAL) Return C{obj} if iterable, otherwise raise C{TypeError}.
     '''
-    for n, v in names_values.items():
-        if not isscalar(v):
-            raise _TypeError(n, v, txt=_not_scalar_)
+    return obj if isiterable(obj) else _xiterror(obj, _xiterable)  # PYCHOK None
+
+
+def _xiterablen(obj):
+    '''(INTERNAL) Return C{obj} if iterable with C{__len__}, otherwise raise C{TypeError}.
+    '''
+    return obj if isiterablen(obj) else _xiterror(obj, _xiterablen)  # PYCHOK None
+
+
+def _xiterror(obj, _xwhich):
+    '''(INTERNAL) Helper for C{_xinterable} and C{_xiterablen}.
+    '''
+    t = _not_(_xwhich.__name__[2:])  # _dunder_nameof
+    raise _TypeError(repr(obj), txt=t)
 
 
 def _xnumpy(where, *required):
@@ -808,13 +796,21 @@ def _xor(x, *xs):
 def _xpackage(_xpkg):
     '''(INTERNAL) Check dependency to be excluded.
     '''
-    n = _xpkg.__name__[2:]  # remove _x
+    n = _xpkg.__name__[2:]  # _dunder_nameof
     if n in _XPACKAGES:
         x = _SPACE_(n, _in_, _PYGEODESY_XPACKAGES_)
         e = _enquote(_getenv(_PYGEODESY_XPACKAGES_, NN))
         raise ImportError(_EQUAL_(x, e))
 
 
+def _xscalar(**names_values):
+    '''(INTERNAL) Check all C{name=value} pairs to be C{scalar}.
+    '''
+    for n, v in names_values.items():
+        if not isscalar(v):
+            raise _TypeError(n, v, txt=_not_scalar_)
+
+
 def _xscipy(where, *required):
     '''(INTERNAL) Import C{scipy} and check required version.
     '''
@@ -851,7 +847,7 @@ def _xversion(package, where, *required, **name):
     if required:
         t = _version_info(package)
         if t[:len(required)] < required:
-            t = _SPACE_(package.__name__,
+            t = _SPACE_(package.__name__,  # _dunder_nameof
                        _version_, _DOT_(*t),
                        _below_, _DOT_(*required),
                        _req_d_by(where, **name))

pygeodesy/booleans.py

@@ -17,7 +17,7 @@ C{reverse-difference}, C{sum} and C{union}.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import isodd, issubclassof, map2, _xisscalar
+from pygeodesy.basics import isodd, issubclassof, map2, _xscalar
 from pygeodesy.constants import EPS, EPS2, INT0, _0_0, _0_5, _1_0
 from pygeodesy.errors import ClipError, _IsnotError, _TypeError, \
                             _ValueError, _xattr, _xkwds_get
@@ -25,7 +25,7 @@ from pygeodesy.fmath import favg, hypot, hypot2
 # from pygeodesy.fsums import fsum1  # _MODS
 from pygeodesy.interns import NN, _BANG_, _clip_, _clipid_, _COMMASPACE_, \
                              _composite_, _DOT_, _e_, _ELLIPSIS_, _few_, \
-                             _height_, _lat_,_LatLon_, _lon_, _not_, \
+                             _height_, _lat_, _LatLon_, _lon_, _not_, \
                              _points_, _SPACE_, _too_, _X_, _x_, \
                              _B_, _d_, _R_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
@@ -42,7 +42,7 @@ from pygeodesy.utily import fabs, _unrollon, _Wrap
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.booleans
-__version__ = '24.02.06'
+__version__ = '24.05.15'
 
 _0_EPS =  EPS  # near-zero, positive
 _EPS_0 = -EPS  # near-zero, negative
@@ -330,7 +330,7 @@ class LatLonFHP(_LatLonBool):
         return self.x * other.x + self.y * other.y
 
     def __rmul__(self, other):  # scalar product
-        _xisscalar(other=other)
+        _xscalar(other=other)
         return self.__class__(self.y * other, self.x * other)
 
     def _e_x_str(self, t):  # PYCHOK no cover

pygeodesy/constants.py

@@ -9,12 +9,13 @@ L{pygeodesy.isnon0} and L{pygeodesy.remainder}.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import _0_0, _copysign, isbool, iscomplex, isint,  _ALL_LAZY
+from pygeodesy.basics import _copysign, isbool, iscomplex, isint,  _0_0
 from pygeodesy.errors import _xError, _xError2, _xkwds_get, _xkwds_item2
+# from pygeodesy.internals import _0_0  # from .basics
 from pygeodesy.interns import _INF_, _NAN_, _UNDER_
-# from pygeodesy.lazily import _ALL_LAZY  # from .basics
+# from pygeodesy.lazily import _ALL_LAZY  # from .unitsBase
 # from pygeodesy.streprs import Fmt  # from .unitsBase
-from pygeodesy.unitsBase import Float, Int, Radius,  Fmt
+from pygeodesy.unitsBase import Float, Int, Radius,  _ALL_LAZY, Fmt
 
 from math import fabs, isinf, isnan, pi as _PI, sqrt
 try:
@@ -23,7 +24,7 @@ except ImportError:  # Python 2-
     _inf, _nan = float(_INF_), float(_NAN_)
 
 __all__ = _ALL_LAZY.constants
-__version__ = '24.04.23'
+__version__ = '24.05.14'
 
 
 def _copysign_0_0(y):
@@ -355,8 +356,9 @@ def isint0(obj, both=False):
        @return: C{True} if B{C{obj}} is L{INT0}, C{int(0)} or
                 C{float(0)}, C{False} otherwise.
     '''
-    return (obj is INT0 or obj is int(0) or bool(both and
-       (not obj) and isint(obj, both=True))) and not isbool(obj)
+    return (obj is INT0 or obj is int(0) or
+            bool(both and (not obj) and isint(obj, both=True))) and \
+            not isbool(obj)
 
 
 def isnear0(x, eps0=EPS0):