pygeodesy 25.4.8__py2.py3-none-any.whl → 25.5.5__py2.py3-none-any.whl

pygeodesy/geoids.py

@@ -89,7 +89,8 @@ courtesy of SBFRF.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import len2, min2, isodd, _splituple, ub2str as _ub2str
+from pygeodesy.basics import _isin, len2, min2, isodd, _splituple, \
+                              ub2str as _ub2str
 from pygeodesy.constants import EPS, _float as _F, _1_0, _N_90_0, _180_0, \
                                      _N_180_0, _360_0
 from pygeodesy.datums import Datums, _ellipsoidal_datum, _WGS84
@@ -100,10 +101,10 @@ from pygeodesy.fmath import favg, Fdot, fdot, Fhorner, frange
 # from pygoedesy.formy import heightOrthometric  # _MODS
 from pygeodesy.heights import _as_llis2, _ascalar, _HeightBase, HeightError, \
                               _Wrap
-# from pygeodesy.internals import _version2  # _MODS
-from pygeodesy.interns import NN, _COLONSPACE_, _COMMASPACE_, _E_, _height_, \
-                             _in_, _kind_, _lat_, _lon_, _mean_, _N_, _n_a_, \
-                             _numpy_, _on_, _outside_, _S_, _s_, _scipy_, \
+# from pygeodesy.internals import typename, _version2  # _MODS
+from pygeodesy.interns import NN, _COLONSPACE_, _COMMASPACE_, _DMAIN_, _E_, \
+                             _height_, _in_, _kind_, _lat_, _lon_, _mean_, _N_, \
+                             _n_a_, _numpy_, _on_, _outside_, _S_, _s_, _scipy_, \
                              _SPACE_, _stdev_, _tbd_, _W_, _width_, _4_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS
 from pygeodesy.named import _name__, _Named, _NamedTuple
@@ -125,7 +126,7 @@ except ImportError:  # Python 3+
     from io import BytesIO as _BytesIO  # PYCHOK expected
 
 __all__ = _ALL_LAZY.geoids
-__version__ = '25.01.15'
+__version__ = '25.04.14'
 
 _assert_    = 'assert'
 _bHASH_     = b'#'
@@ -571,7 +572,7 @@ class _GeoidBase(_HeightBase):
         except (IOError, OSError) as x:
             raise GeoidError(geoid=geoid, cause=x)
 
-        if datum not in (None, self._datum):
+        if not _isin(datum, None, self._datum):
             self._datum = _ellipsoidal_datum(datum, name=name)
         self._kind = int(kind)
         if name:
@@ -651,15 +652,16 @@ class _GeoidBase(_HeightBase):
 
            @return: Geoid name and attributes (C{str}).
         '''
-        s = 1 if self.kind < 0 else 2
-        t = tuple(Fmt.PAREN(m.__name__, fstr(m(), prec=prec)) for m in
-                                       (self.lowerleft, self.upperright,
-                                        self.center,
-                                        self.highest, self.lowest)) + \
-            attrs( _mean_, _stdev_,           prec=prec, Nones=False) + \
-            attrs((_kind_, 'smooth')[:s],     prec=prec, Nones=False) + \
-            attrs( 'cropped', 'dtype', _endian_, 'hits', 'knots', 'nBytes',
-                   'sizeB', _scipy_, _numpy_, prec=prec, Nones=False)
+        s =  1 if self.kind < 0 else 2
+        t = _MODS.internals.typename
+        t =  tuple(Fmt.PAREN(t(m), fstr(m(), prec=prec)) for m in
+                                  (self.lowerleft, self.upperright,
+                                   self.center,
+                                   self.highest, self.lowest)) + \
+             attrs( _mean_, _stdev_,           prec=prec, Nones=False) + \
+             attrs((_kind_, 'smooth')[:s],     prec=prec, Nones=False) + \
+             attrs( 'cropped', 'dtype', _endian_, 'hits', 'knots', 'nBytes',
+                    'sizeB', _scipy_, _numpy_, prec=prec, Nones=False)
         return _COLONSPACE_(self, sep.join(t))
 
     @Property_RO
@@ -1036,9 +1038,9 @@ class GeoidKarney(_GeoidBase):
         if smooth is not None:
             raise GeoidError(smooth=smooth, txt_not_=_supported_)
 
-        if kind in (2,):
+        if _isin(kind, 2):
             self._ev2d = self._ev2k  # see ._ev_name
-        elif kind not in (3,):
+        elif not _isin(kind, 3):
             raise GeoidError(kind=kind)
 
         self._egm = g =  self._open(egm_pgm, datum, kind, _name__(**name), None)
@@ -1716,7 +1718,7 @@ def egmGeoidHeights(GeoidHeights_dat):
 
 __all__ += _ALL_DOCS(_GeoidBase)
 
-if __name__ == '__main__':  # MCCABE 14
+if __name__ == _DMAIN_:  # MCCABE 14
 
     from pygeodesy.internals import printf, _secs2str, _versions,  _sys
     from time import time
@@ -1727,30 +1729,31 @@ if __name__ == '__main__':  # MCCABE 14
 
     geoids = _sys.argv[1:]
     while geoids:
-        geoid = geoids.pop(0)
+        G = geoids.pop(0)
+        g = G.lower()
 
-        if '-crop'.startswith(geoid.lower()):
+        if '-crop'.startswith(g):
             _crop = dict(crp=(20, -125, 50, -65))  # CONUS
 
-        elif '-egm96'.startswith(geoid.lower()):
+        elif '-egm96'.startswith(g):
             _GeoidEGM = GeoidEGM96
 
-        elif '-karney'.startswith(geoid.lower()):
+        elif '-karney'.startswith(g):
             _GeoidEGM = GeoidKarney
 
-        elif '-kind'.startswith(geoid.lower()):
+        elif '-kind'.startswith(g):
             _kind = int(geoids.pop(0))
 
-        elif '-pgm'.startswith(geoid.lower()):
+        elif '-pgm'.startswith(g):
             _GeoidEGM = GeoidPGM
 
-        elif geoid[-4:].lower() in ('.pgm', '.grd'):
-            g = _GeoidEGM(geoid, kind=_kind, **_crop)
+        elif _isin(g[-4:], '.pgm', '.grd'):
+            g = _GeoidEGM(G, kind=_kind, **_crop)
             t =  time()
             _ =  g.highest()
             t = _secs2str(time() - t)
             printf('%s: %s (%s)', g.toStr(), t, _versions(), nl=1, nt=1)
-            t = g.pgm
+            t =  g.pgm
             if t:
                 printf(repr(t), nt=1)
             # <https://GeographicLib.SourceForge.io/cgi-bin/GeoidEval>:
@@ -1771,12 +1774,12 @@ if __name__ == '__main__':  # MCCABE 14
                 except (GeoidError, RangeError) as x:
                     printf(_COLONSPACE_(t, str(x)))
 
-        elif geoid[-4:].lower() in ('.bin',):
-            g = GeoidG2012B(geoid, kind=_kind)
+        elif _isin(g[-4:], '.bin'):
+            g = GeoidG2012B(G, kind=_kind)
             printf(g.toStr())
 
         else:
-            raise GeoidError(grid=repr(geoid))
+            raise GeoidError(grid=repr(G))
 
 _I = int  # PYCHOK unused _I
 del _intCs, _T, _T0s12  # trash ints cache and map

pygeodesy/hausdorff.py

@@ -66,13 +66,14 @@ breaking} and C{random sampling} as in U{Abdel Aziz Taha, Allan Hanbury
 Analysis Machine Intelligence (PAMI), vol 37, no 11, pp 2153-2163, Nov 2015.
 '''
 
+# from pygeodesy.basics import _isin  # from .datums
 from pygeodesy.constants import INF, NINF, _0_0
-from pygeodesy.datums import _ellipsoidal_datum, _WGS84
+from pygeodesy.datums import _ellipsoidal_datum, _WGS84,  _isin
 from pygeodesy.errors import PointsError, _xattr, _xcallable, _xkwds, _xkwds_get
-import pygeodesy.formy as _formy
+# from pygeodesy import formy as _formy  # _MODS.into
 from pygeodesy.interns import NN, _i_, _j_, _units_
-# from pygeodesy.iters import points2 as _points  # from .points
-from pygeodesy.lazily import _ALL_LAZY, _FOR_DOCS
+# from pygeodesy.iters import points2 as _points2  # from .points
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS
 from pygeodesy.named import _name2__, _Named, _NamedTuple, _Pass
 # from pygeodesy.namedTuples import PhiLam2Tuple  # from .points
 from pygeodesy.points import _distanceTo,  PhiLam2Tuple, points2 as _points2, radians
@@ -84,7 +85,9 @@ from pygeodesy import unitsBase as _unitsBase  # _Str_..., _xUnit, _xUnits
 from random import Random
 
 __all__ = _ALL_LAZY.hausdorff
-__version__ = '24.12.31'
+__version__ = '25.04.21'
+
+_formy = _MODS.into(formy=__name__)
 
 
 class HausdorffError(PointsError):
@@ -149,7 +152,7 @@ class Hausdorff(_Named):
         '''(INTERNAL) Set the datum.
         '''
         d = datum or _xattr(self._model[0], datum=datum)
-        if d not in (None, self._datum):  # PYCHOK no cover
+        if not _isin(d, None, self._datum):  # PYCHOK no cover
             self._datum = _ellipsoidal_datum(d, name=self.name)
 
     def directed(self, point2s, early=True):
@@ -658,13 +661,13 @@ def _hausdorff_(ps1, ps2, both, early, seed, units, distance, point):
     # chance of an early break in the inner j loop
     rr = randomrangenerator(seed) if seed else range
 
-    hd = NINF
-    hi = hj = m = mn = 0
+    hd =  NINF
+    mn =  m = hi = hj = 0
     md = _0_0
 
     # forward or forward and backward
     for fb in range(2 if both else 1):
-        n = len(ps2)
+        ji, n = False, len(ps2)
         for i in rr(len(ps1)):
             p1 = point(ps1[i])
             dh, dj = INF, 0
@@ -678,13 +681,14 @@ def _hausdorff_(ps1, ps2, both, early, seed, units, distance, point):
             else:  # no early break
                 if hd < dh:
                     hd = dh
-                    if fb:
-                        hi, hj = dj, i
-                    else:
-                        hi, hj = i, dj
+                    hi =  i
+                    hj = dj
+                    ji = fb
                 md += dh
                 mn += 1
             m += 1
+        if ji:  # swap indices
+            hi, hj = hj, hi
         # swap model and target
         ps1, ps2 = ps2, ps1
 

pygeodesy/heights.py

@@ -77,9 +77,7 @@ from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.errors import _AssertionError, LenError, PointsError, \
                              _SciPyIssue, _xattr, _xkwds, _xkwds_get, _xkwds_item2
 # from pygeodesy.fmath import fidw  # _MODS
-# from pygeodesy.formy import cosineLaw, cosineLawAL, cosineLawFAL, equirectangular4, \
-#                             euclidean, flatLocal, flatPolar, haversine, thomas, \
-#                             vincentys  # _MODS.into
+# from pygeodesy import formy as _formy  # _MODS.into
 # from pygeodesy.internals import _version2  # _MODS
 from pygeodesy.interns import NN, _COMMASPACE_, _insufficient_, _NOTEQUAL_, \
                              _PLUS_, _scipy_, _SPACE_, _STAR_
@@ -94,7 +92,7 @@ from pygeodesy.units import _isDegrees, Float_, Int_
 # from math import radians  # from .points
 
 __all__ = _ALL_LAZY.heights
-__version__ = '24.12.31'
+__version__ = '25.04.21'
 
 _error_  = 'error'
 _formy   = _MODS.into(formy=__name__)

pygeodesy/internals.py

@@ -5,9 +5,9 @@ u'''Mostly INTERNAL functions, except L{machine}, L{print_} and L{printf}.
 '''
 # from pygeodesy.basics import isiterablen, ubstr  # _MODS
 # from pygeodesy.errors import _AttributeError, _error_init, _UnexpectedError, _xError2  # _MODS
-from pygeodesy.interns import NN, _BAR_, _COLON_, _DASH_, _DOT_, _ELLIPSIS_, _EQUALSPACED_, \
-                             _immutable_, _NL_, _pygeodesy_, _PyPy__, _python_, _QUOTE1_, \
-                             _QUOTE2_, _s_, _SPACE_, _sys, _UNDER_
+from pygeodesy.interns import _BAR_, _COLON_, _DASH_, _DMAIN_, _DOT_, _ELLIPSIS_, _EQUALSPACED_, \
+                              _immutable_, _NL_, NN, _pygeodesy_, _PyPy__, _python_, _QUOTE1_, \
+                              _QUOTE2_, _s_, _SPACE_, _sys, _UNDER_
 from pygeodesy.interns import _COMMA_, _Python_  # PYCHOK used!
 # from pygeodesy.streprs import anstr, pairs, unstr  # _MODS
 
@@ -24,26 +24,20 @@ _SIsecs   = 'fs', 'ps', 'ns', 'us', 'ms', 'sec'  # reversed
 _Windows_ = 'Windows'
 
 
-def _DUNDER_nameof(inst, *dflt):
-    '''(INTERNAL) Get the DUNDER C{.__name__} attr.
+def typename(obj, *dflt):
+    '''Get the C{obj.__name__}, the C{dflt} or its outer C{type.__name__} or C{NN} (C{str}).
     '''
     try:
-        return inst.__name__
-    except AttributeError:
+        return obj.__name__
+    except (AttributeError, ImportError):  # LazyImportError
         pass
-    return dflt[0] if dflt else inst.__class__.__name__
-
-
-def _DUNDER_nameof_(*names__):  # in .errors._IsnotError
-    '''(INTERNAL) Yield the _DUNDER_nameof or name.
-    '''
-    return map(_DUNDER_nameof, names__, names__)
+    return dflt[0] if dflt else typename(type(obj), NN)
 
 
 def _Property_RO(method):
     '''(INTERNAL) Can't import L{props.Property_RO}, I{recursively}.
     '''
-    name = _DUNDER_nameof(method)
+    name = typename(method)
 
     def _del(inst, *unused):  # PYCHOK no cover
         inst.__dict__.pop(name, None)
@@ -138,7 +132,7 @@ class _MODS_Base(object):
     def name(self):
         '''Get this name (C{str}).
         '''
-        return _DUNDER_nameof(self.__class__)
+        return typename(self.__class__)
 
     @_Property_RO
     def nix2(self):  # PYCHOK no cover
@@ -286,6 +280,12 @@ def _enquote(strs, quote=_QUOTE2_, white=NN):  # in .basics, .solveBase
     return strs
 
 
+def _envPYGEODESY(which, dflt=NN):
+    '''(INTERNAL) Return an C{PYGEODESY_...} ENV value or C{dflt}.
+    '''
+    return _getenv(_PYGEODESY_ENV(which), dflt)
+
+
 def _fper(p, q, per=_100_0, prec=1):
     '''Format a percentage C{B{p} * B{per} / B{q}} (C{str}).
     '''
@@ -295,12 +295,6 @@ def _fper(p, q, per=_100_0, prec=1):
 _getenv = _MODS.os.getenv  # PYCHOK in .lazily, ...
 
 
-def _getPYGEODESY(which, dflt=NN):
-    '''(INTERNAL) Return an C{PYGEODESY_...} ENV value or C{dflt}.
-    '''
-    return _getenv(_PYGEODESY(which), dflt)
-
-
 def _headof(name):
     '''(INTERNAL) Get the head name of qualified C{name} or the C{name}.
     '''
@@ -320,12 +314,6 @@ def _isAppleSi():  # PYCHOK no cover
     return _ismacOS() and machine().startswith(_arm64_)
 
 
-def _is_DUNDER_main(name):
-    '''(INTERNAL) Return C{bool(name == '__main__')}.
-    '''
-    return name == '__main__'
-
-
 def _isiOS():  # in test/bases
     '''(INTERNAL) Is this C{iOS}? (C{bool})
     '''
@@ -350,7 +338,7 @@ def _isPyChOK():  # PYCHOK no cover
     '''
     # .../pychecker/checker.py --limit 0 --stdlib pygeodesy/<mod>/<name>.py
     return _sys.argv[0].endswith('/pychecker/checker.py') or \
-            bool(_getPYGEODESY('PYCHOK'))
+            bool(_envPYGEODESY('PYCHOK'))
 
 
 def _isPyPy():  # in test/bases
@@ -407,9 +395,9 @@ def machine():
 
 
 def _name_version(pkg):
-    '''(INTERNAL) Return C{pskg.__name__ + ' ' + .__version__}.
+    '''(INTERNAL) Return C{pkg.__name__ + ' ' + .__version__}.
     '''
-    return _SPACE_(pkg.__name__, pkg.__version__)
+    return _SPACE_(typename(pkg), pkg.__version__)  # _DVERSION_
 
 
 def _osversion2(sep=NN):  # in .lazily, test/bases.versions
@@ -510,14 +498,10 @@ def _print7(nl=0, nt=0, prec=6, prefix=NN, sep=_SPACE_, file=_sys.stdout,
     return prefix, end, file, flush, prec, sep, kwds
 
 
-def _PYGEODESY(which, i=0):
+def _PYGEODESY_ENV(which):
     '''(INTERNAL) Return an ENV C{str} C{PYGEODESY_...}.
     '''
-    try:
-        w = which.__name__.lstrip(_UNDER_)[i:]
-    except AttributeError:
-        w = which
-    return _UNDER_(_pygeodesy_, w).upper()
+    return _UNDER_(_pygeodesy_, typename(which, which)).upper()
 
 
 def _Pythonarchine(sep=NN):  # in .lazily, test/bases versions
@@ -613,7 +597,7 @@ def _tailof(name):
     return name[i:] if i > 0 else name
 
 
-def _under(name):  # PYCHOK in .datums, .auxilats, .ups, .utm, .utmupsBase, ...
+def _under(name):  # PYCHOK in .datums, .auxilats, .geodesicw, .ups, .utm, .utmupsBase, ...
     '''(INTERNAL) Prefix C{name} with an I{underscore}.
     '''
     return name if name.startswith(_UNDER_) else NN(_UNDER_, name)
@@ -643,7 +627,7 @@ def _usage(file_py, *args, **opts_help):  # in .etm, .geodesici  # PYCHOK no cov
 
         args = _help(**opts_help) or (tuple(_opts(**opts_help)) + args)
 
-    u = _COLON_(_DUNDER_nameof(_usage)[1:], NN)
+    u = _COLON_(typename(_usage)[1:], NN)
     return _SPACE_(u, *_usage_argv(file_py, *args))
 
 
@@ -656,7 +640,7 @@ def _usage_argv(argv0, *args):
           .replace(o.sep,      _DOT_).strip()
     b =  o.path.basename(argv0)
     b, x = o.path.splitext(b)
-    if x == '.py' and not _is_DUNDER_main(b):
+    if x == '.py' and b != _DMAIN_:
         m = _DOT_(m or _pygeodesy_, b)
     p = NN(_python_, _MODS.sys_version_info2[0])
     return (p, '-m', _enquote(m)) + args
@@ -701,10 +685,10 @@ def _versions(sep=_SPACE_):
     return sep.join(l7) if sep else l7  # 5- or 6-list
 
 
-__all__ = tuple(map(_DUNDER_nameof, (machine, print_, printf)))
-__version__ = '25.04.04'
+__all__ = tuple(map(typename, (machine, print_, printf, typename)))
+__version__ = '25.04.14'
 
-if _is_DUNDER_main(__name__):  # PYCHOK no cover
+if __name__ == _DMAIN_:
 
     def _main():
         from pygeodesy import _isfrozen, isLazy
@@ -715,7 +699,7 @@ if _is_DUNDER_main(__name__):  # PYCHOK no cover
     _main()
 
 # % python3 -m pygeodesy.internals
-# pygeodesy 25.4.4 Python 3.13.2 64bit arm64 macOS 15.4 _isfrozen False isLazy 1
+# pygeodesy 25.4.14 Python 3.13.2 64bit arm64 macOS 15.4 _isfrozen False isLazy 1
 
 # **) MIT License
 #

pygeodesy/interns.py

@@ -117,13 +117,15 @@ class _Slicer(str):
 class MISSING(object):
     '''(INTERNAL) Singleton C{str}.
     '''
+    def __init__(self):
+        self.__name__ = type(self).__name__
+
     def toRepr(self, **unused):
-        return self.__class__.__name__
+        return type(self).__name__
 
     __repr__ = __str__ = toStr = toRepr
 
-MISSING          = MISSING()  # PYCHOK singleton
-MISSING.__name__ = str(MISSING)
+MISSING = MISSING()  # PYCHOK singleton
 
 # __DUNDER__-style names would get mangled in classes
 _0_                   = '0'                  # PYCHOK 'zero'
@@ -186,6 +188,7 @@ _conversion_          = 'conversion'         # PYCHOK OK
 _convex_              = 'convex'             # PYCHOK OK
 _d_                   = 'd'                  # PYCHOK OK
 _D_                   = 'D'                  # PYCHOK OK
+_DALL_                = '__all__'            # PYCHOK _DUNDER_(NN, 'all', NN)
 _DASH_           = Str_('-')                 # PYCHOK == _MINUS_
 _datum_               = 'datum'              # PYCHOK OK
 _decode3_             = 'decode3'            # PYCHOK OK
@@ -197,10 +200,10 @@ _DEPRECATED_          = 'DEPRECATED'         # PYCHOK OK
 _DEQUALSPACED_   = Str_(' == ')              # PYCHOK OK
 _distance_            = 'distance'           # PYCHOK OK
 _distant_     = _Prefix('distant')           # PYCHOK OK
+_DMAIN_               = '__main__'           # PYCHOK _DUNDER_(NN, 'main', NN)
+_DNAME_               = '__name__'           # PYCHOK _DUNDER_(NN, _name_, NN)
 _doesn_t_exist_       = "doesn't exist"      # PYCHOK OK
 _DOT_            = Str_('.')                 # PYCHOK OK
-_DUNDER_all_          = '__all__'            # PYCHOK OK
-_DUNDER_name_         = '__name__'           # PYCHOK _DUNDER_(NN, _name_, NN)
 _duplicate_           = 'duplicate'          # PYCHOK OK
 _e_                   = 'e'                  # PYCHOK OK
 _E_                   = 'E'                  # PYCHOK OK
@@ -440,9 +443,9 @@ _LR_PAIRS  = {_LANGLE_:  _RANGLE_,
 
 __all__ = (_NN_,  # NOT MISSING!
             Str_.__name__)  # classes
-__version__ = '25.01.12'
+__version__ = '25.04.12'
 
-if __name__ == '__main__':
+if __name__ == _DMAIN_:
 
     def _main():
         from pygeodesy import itemsorted, printf

pygeodesy/iters.py

@@ -9,12 +9,12 @@ the initial items, skipping of duplicate items and copying of the
 iterated items.
 '''
 
-from pygeodesy.basics import islistuple, issubclassof, len2, \
-                             map2,  _passarg
+from pygeodesy.basics import _isin, islistuple, issubclassof, \
+                              len2, map2,  _passarg, typename
 # from pygeodesy.constants import _1_0  # from .utily
 from pygeodesy.errors import _IndexError, LenError, PointsError, \
                              _TypeError, _ValueError
-# from pygeodesy.internals import _passarg  # from .basics
+# from pygeodesy.internals import _passarg, typename  # from .basics
 from pygeodesy.interns import _0_, _composite_, _few_, _latlon_, \
                               _points_, _too_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
@@ -26,7 +26,7 @@ from pygeodesy.units import Int, Radius
 from pygeodesy.utily import degrees2m, _Wrap,  _1_0
 
 __all__ = _ALL_LAZY.iters
-__version__ = '24.06.09'
+__version__ = '25.04.14'
 
 _items_        = 'items'
 _iterNumpy2len =  1  # adjustable for testing purposes
@@ -382,7 +382,7 @@ class LatLon2PsxyIter(PointsIter):
 
            @raise TypeError: Some B{C{points}} are not B{C{base}}-compatible.
         '''
-        if self._deg2m not in (None, _1_0):
+        if not _isin(self._deg2m, None, _1_0):
             _p3 = self._point3Tuple
         else:
             def _p3(ll):  # PYCHOK redef
@@ -417,7 +417,7 @@ def isNumpy2(obj):
                 instance, C{False} otherwise.
     '''
     # isinstance(self, (Numpy2LatLon, ...))
-    return getattr(obj, isNumpy2.__name__, False)
+    return getattr(obj, typename(isNumpy2), False)
 
 
 def isPoints2(obj):
@@ -429,7 +429,7 @@ def isPoints2(obj):
                 instance, C{False} otherwise.
     '''
     # isinstance(self, (LatLon2psxy, ...))
-    return getattr(obj, isPoints2.__name__, False)
+    return getattr(obj, typename(isPoints2), False)
 
 
 def isTuple2(obj):
@@ -441,7 +441,7 @@ def isTuple2(obj):
                 instance, C{False} otherwise.
     '''
     # isinstance(self, (Tuple2LatLon, ...))
-    return getattr(obj, isTuple2.__name__, False)
+    return getattr(obj, typename(isTuple2), False)
 
 
 def iterNumpy2(obj):