python-casacore 3.6.1__tar.gz → 3.7.1__tar.gz

{python_casacore-3.6.1 → python_casacore-3.7.1}/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.7.1
+
+This version as a binary wheel ships with underlying casacore v3.7.1.
+
 # 3.6.1
 
 This version as a binary wheel ships with underlying casacore v3.6.1.

{python_casacore-3.6.1 → python_casacore-3.7.1}/CMakeLists.txt

@@ -9,7 +9,7 @@ find_package(
 # Find Casacore and its dependencies
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 find_package(Casacore REQUIRED)
-find_package(Boost REQUIRED COMPONENTS python)
+find_package(Boost REQUIRED COMPONENTS python3)
 
 # If environment variable CASACORE_DATA is set, assume it points to a directory
 # containing the cascacore data files, and install its contents.

python_casacore-3.7.1/PKG-INFO

@@ -0,0 +1,274 @@
+Metadata-Version: 2.2
+Name: python-casacore
+Version: 3.7.1
+Summary: A wrapper around CASACORE, the radio astronomy library
+Keywords: pyrap,casacore,utilities,astronomy
+Author-Email: Malte Marquarding <Malte.Marquarding@gmail.com>, Ger van Diepen <gervandiepen@gmail.com>, Gijs Molenaar <gijs@pythonic.nl>, Tammo Jan Dijkema <dijkema@astron.nl>, Marcel Loose <loose@astron.nl>
+License:                    GNU LESSER GENERAL PUBLIC LICENSE
+                                Version 3, 29 June 2007
+         
+          Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+          Everyone is permitted to copy and distribute verbatim copies
+          of this license document, but changing it is not allowed.
+         
+         
+           This version of the GNU Lesser General Public License incorporates
+         the terms and conditions of version 3 of the GNU General Public
+         License, supplemented by the additional permissions listed below.
+         
+           0. Additional Definitions.
+         
+           As used herein, "this License" refers to version 3 of the GNU Lesser
+         General Public License, and the "GNU GPL" refers to version 3 of the GNU
+         General Public License.
+         
+           "The Library" refers to a covered work governed by this License,
+         other than an Application or a Combined Work as defined below.
+         
+           An "Application" is any work that makes use of an interface provided
+         by the Library, but which is not otherwise based on the Library.
+         Defining a subclass of a class defined by the Library is deemed a mode
+         of using an interface provided by the Library.
+         
+           A "Combined Work" is a work produced by combining or linking an
+         Application with the Library.  The particular version of the Library
+         with which the Combined Work was made is also called the "Linked
+         Version".
+         
+           The "Minimal Corresponding Source" for a Combined Work means the
+         Corresponding Source for the Combined Work, excluding any source code
+         for portions of the Combined Work that, considered in isolation, are
+         based on the Application, and not on the Linked Version.
+         
+           The "Corresponding Application Code" for a Combined Work means the
+         object code and/or source code for the Application, including any data
+         and utility programs needed for reproducing the Combined Work from the
+         Application, but excluding the System Libraries of the Combined Work.
+         
+           1. Exception to Section 3 of the GNU GPL.
+         
+           You may convey a covered work under sections 3 and 4 of this License
+         without being bound by section 3 of the GNU GPL.
+         
+           2. Conveying Modified Versions.
+         
+           If you modify a copy of the Library, and, in your modifications, a
+         facility refers to a function or data to be supplied by an Application
+         that uses the facility (other than as an argument passed when the
+         facility is invoked), then you may convey a copy of the modified
+         version:
+         
+            a) under this License, provided that you make a good faith effort to
+            ensure that, in the event an Application does not supply the
+            function or data, the facility still operates, and performs
+            whatever part of its purpose remains meaningful, or
+         
+            b) under the GNU GPL, with none of the additional permissions of
+            this License applicable to that copy.
+         
+           3. Object Code Incorporating Material from Library Header Files.
+         
+           The object code form of an Application may incorporate material from
+         a header file that is part of the Library.  You may convey such object
+         code under terms of your choice, provided that, if the incorporated
+         material is not limited to numerical parameters, data structure
+         layouts and accessors, or small macros, inline functions and templates
+         (ten or fewer lines in length), you do both of the following:
+         
+            a) Give prominent notice with each copy of the object code that the
+            Library is used in it and that the Library and its use are
+            covered by this License.
+         
+            b) Accompany the object code with a copy of the GNU GPL and this license
+            document.
+         
+           4. Combined Works.
+         
+           You may convey a Combined Work under terms of your choice that,
+         taken together, effectively do not restrict modification of the
+         portions of the Library contained in the Combined Work and reverse
+         engineering for debugging such modifications, if you also do each of
+         the following:
+         
+            a) Give prominent notice with each copy of the Combined Work that
+            the Library is used in it and that the Library and its use are
+            covered by this License.
+         
+            b) Accompany the Combined Work with a copy of the GNU GPL and this license
+            document.
+         
+            c) For a Combined Work that displays copyright notices during
+            execution, include the copyright notice for the Library among
+            these notices, as well as a reference directing the user to the
+            copies of the GNU GPL and this license document.
+         
+            d) Do one of the following:
+         
+                0) Convey the Minimal Corresponding Source under the terms of this
+                License, and the Corresponding Application Code in a form
+                suitable for, and under terms that permit, the user to
+                recombine or relink the Application with a modified version of
+                the Linked Version to produce a modified Combined Work, in the
+                manner specified by section 6 of the GNU GPL for conveying
+                Corresponding Source.
+         
+                1) Use a suitable shared library mechanism for linking with the
+                Library.  A suitable mechanism is one that (a) uses at run time
+                a copy of the Library already present on the user's computer
+                system, and (b) will operate properly with a modified version
+                of the Library that is interface-compatible with the Linked
+                Version.
+         
+            e) Provide Installation Information, but only if you would otherwise
+            be required to provide such information under section 6 of the
+            GNU GPL, and only to the extent that such information is
+            necessary to install and execute a modified version of the
+            Combined Work produced by recombining or relinking the
+            Application with a modified version of the Linked Version. (If
+            you use option 4d0, the Installation Information must accompany
+            the Minimal Corresponding Source and Corresponding Application
+            Code. If you use option 4d1, you must provide the Installation
+            Information in the manner specified by section 6 of the GNU GPL
+            for conveying Corresponding Source.)
+         
+           5. Combined Libraries.
+         
+           You may place library facilities that are a work based on the
+         Library side by side in a single library together with other library
+         facilities that are not Applications and are not covered by this
+         License, and convey such a combined library under terms of your
+         choice, if you do both of the following:
+         
+            a) Accompany the combined library with a copy of the same work based
+            on the Library, uncombined with any other library facilities,
+            conveyed under the terms of this License.
+         
+            b) Give prominent notice with the combined library that part of it
+            is a work based on the Library, and explaining where to find the
+            accompanying uncombined form of the same work.
+         
+           6. Revised Versions of the GNU Lesser General Public License.
+         
+           The Free Software Foundation may publish revised and/or new versions
+         of the GNU Lesser General Public License from time to time. Such new
+         versions will be similar in spirit to the present version, but may
+         differ in detail to address new problems or concerns.
+         
+           Each version is given a distinguishing version number. If the
+         Library as you received it specifies that a certain numbered version
+         of the GNU Lesser General Public License "or any later version"
+         applies to it, you have the option of following the terms and
+         conditions either of that published version or of any later version
+         published by the Free Software Foundation. If the Library as you
+         received it does not specify a version number of the GNU Lesser
+         General Public License, you may choose any version of the GNU Lesser
+         General Public License ever published by the Free Software Foundation.
+         
+           If the Library as you received it specifies that a proxy can decide
+         whether future versions of the GNU Lesser General Public License shall
+         apply, that proxy's public statement of acceptance of any version is
+         permanent authorization for you to choose that version for the
+         Library.
+         
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
+Classifier: Natural Language :: English
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: C++
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Scientific/Engineering :: Astronomy
+Project-URL: Homepage, https://github.com/casacore/python-casacore
+Requires-Python: >=3.8
+Requires-Dist: numpy
+Description-Content-Type: text/x-rst
+
+python-casacore
+===============
+
+Python-casacore is a set of Python bindings for `casacore <https://code.google.com/p/casacore/>`_,
+a c++ library used in radio astronomy. Python-casacore replaces the old
+`pyrap <https://code.google.com/p/pyrap/>`_.
+
+
+The python-casacore documentation can be found on `casacore.github.io/python-casacore <http://casacore.github.io/python-casacore>`_.
+
+Build status
+------------
+
+.. image:: https://github.com/casacore/python-casacore/actions/workflows/linux.yml/badge.svg
+    :target: https://github.com/casacore/python-casacore/actions/workflows/linux.yml
+.. image:: https://github.com/casacore/python-casacore/actions/workflows/osx.yml/badge.svg
+    :target: https://github.com/casacore/python-casacore/actions/workflows/osx.yml
+
+
+Installation
+============
+
+Binary wheels
+-------------
+
+We distribute binary manylinux2014 for Linux, which requires pip >= 19.3. To
+install python-casacore from a binary wheel run::
+
+    $ pip install python-casacore
+
+
+Debian & Ubuntu
+---------------
+
+python-casacore is now part of Debian and Ubuntu and can be installed using apt::
+
+    $ sudo apt-get install python3-casacore
+
+
+from source
+-----------
+
+install these requirements:
+
+* `Casacore <https://github.com/casacore/casacore/>`__
+* `Boost-python <http://www.boost.org/libs/python/doc/>`_
+* `numpy <http://www.numpy.org/>`_
+* `cfitsio <http://heasarc.gsfc.nasa.gov/fitsio/>`_
+* `wcslib <https://www.atnf.csiro.au/people/mcalabre/WCS/>`_
+* `pip <https://bootstrap.pypa.io/get-pip.py>`_
+
+On ubuntu you can install these with::
+
+    $ apt-get install casacore-dev libboost-python-dev python3-numpy \
+        libcfitsio3-dev wcslib-dev python3-pip
+
+* compile and install::
+
+    $ pip install --no-binary python-casacore python-casacore
+
+* or if you are installing from the source repository::
+
+    $ pip install .
+
+* If the compilation fails you might need to help the compiler find the paths to the
+  boost and casacore libraries and headers. You can control this with the `CFLAGS` environment
+  variable. For example on OS X when using homebrew and clang you need to do something like
+  this::
+
+    CFLAGS="-std=c++11 \
+            -I/usr/local/Cellar/boost/1.68.0/include/ \
+            -I/usr/local/include/  \
+            -L/usr/local/Cellar/boost/1.68.0/lib \
+            -L/usr/local/lib/" \
+            pip install python-casacore
+
+Support
+=======
+
+if you have any problems, suggestions or questions please open an issue on the
+python-casacore github issue tracker.
+
+Credits
+=======
+
+* `Ger van Diepen <gervandiepen@gmail.com>`_
+* `Malte Marquarding <Malte.Marquarding@gmail.com>`_
+* `Gijs Molenaar <gijs@pythonic.nl>`_
+* `Tammo Jan Dijkema <dijkema@astron.nl>`_

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.6.1'
-__version_tuple__ = version_tuple = (3, 6, 1)
+__version__ = version = '3.7.1'
+__version_tuple__ = version_tuple = (3, 7, 1)

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/fitting/fitting.py

@@ -1,10 +1,6 @@
-from __future__ import print_function
-
 from ._fitting import fitting
 import numpy as NUM
-import six
 from casacore.functionals import *
-from six import string_types
 
 
 class fitserver(object):
@@ -102,13 +98,13 @@ class fitserver(object):
             return False
 
     def _gettype(self, ftype):
-        if isinstance(ftype, string_types):
+        if isinstance(ftype, str):
             ftype = ftype.lower()
             if ftype not in self._typeids:
                 raise TypeError("Illegal fitting type")
             else:
                 return self._typeids[ftype]
-        elif isinstance(ftype, six.integer_types):
+        elif isinstance(ftype, int):
             if ftype not in self._typeids.values():
                 raise TypeError("Illegal fitting type")
         else:

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/functionals/functional.py

@@ -1,4 +1,3 @@
-from six import string_types, integer_types
 from ._functionals import _functional
 
 import numpy
@@ -20,19 +19,19 @@ def copydoc(fromfunc, sep="\n"):
 
 class functional(_functional):
     def __init__(self, name=None, order=-1, params=None, mode=None, dtype=0):
-        if isinstance(dtype, string_types):
+        if isinstance(dtype, str):
             dtypes = {'real': 0, 'complex': 1}
             dtype = dtypes.get(dtype.lower())
         if numpy.iscomplexobj(params):
             dtype = 1
         self._dtype = dtype
         progtext = ""
-        if not isinstance(name, string_types):
+        if not isinstance(name, str):
             raise TypeError("'name' was not of type string")
-        if not (isinstance(order, integer_types) or isinstance(order, string_types)):
+        if not (isinstance(order, int) or isinstance(order, str)):
             raise TypeError("'order' was not of type integer or string")
         else:
-            if isinstance(order, string_types):
+            if isinstance(order, str):
                 progtext = order
                 order = -1
         # our own functionals server

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/images/coordinates.py

@@ -25,8 +25,6 @@
 #
 # $Id$
 
-from __future__ import print_function
-
 
 class coordinatesystem(object):
     """

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/images/image.py

@@ -23,9 +23,6 @@
 #                        520 Edgemont Road
 #                        Charlottesville, VA 22903-2475 USA
 
-from __future__ import print_function
-
-from six import string_types, integer_types
 from ._images import Image
 import numpy
 import numpy.ma as nma
@@ -128,7 +125,7 @@ class image(Image):
             if isinstance(imagename, tuple) or isinstance(imagename, list):
                 if len(imagename) == 0:
                     raise ValueError('No images given in list or tuple')
-                if isinstance(imagename[0], string_types):
+                if isinstance(imagename[0], str):
                     # Concatenate from image names
                     Image.__init__(self, imagename, axis)
                     opened = True
@@ -137,7 +134,7 @@ class image(Image):
                     Image.__init__(self, imagename, axis, 0, 0)
                     opened = True
             if not opened:
-                if not isinstance(imagename, string_types):
+                if not isinstance(imagename, str):
                     raise ValueError("first argument must be name or" +
                                      " sequence of images or names")
                 if shape is None:
@@ -259,7 +256,7 @@ class image(Image):
         It can only be used for unique attribute keys. An IndexError exception
         is raised if no or multiple matches are found.
         """
-        if not isinstance(key, string_types):
+        if not isinstance(key, str):
             return self._attrgetrow(groupname, key)
         # The key is an attribute name whose value has to be found.
         rownrs = self.attrfindrows(groupname, key, value)
@@ -610,7 +607,7 @@ class image(Image):
 
     def _adaptAxes(self, axes):
         # If axes is a single integer value, turn it into a list.
-        if isinstance(axes, integer_types):
+        if isinstance(axes, int):
             axes = [axes]
         # ImageProxy expects Fortran-numbered axes.
         # So reverse the axes.

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/measures/__init__.py

@@ -31,7 +31,6 @@ from ._measures import measures as _measures
 import casacore.quanta as dq
 import os
 
-from six import string_types
 
 if 'MEASURESDATA' in os.environ.keys():
     if 'AIPSPATH' not in os.environ.keys():
@@ -436,7 +435,7 @@ class measures(_measures):
         """
         if is_measure(rfq) and rfq['type'] == 'frequency':
             rfq = dq.quantity(rfq['m0'])
-        elif isinstance(rfq, string_types):
+        elif isinstance(rfq, str):
             rfq = dq.quantity(rfq)
         if is_measure(v0) and v0['type'] == 'doppler' \
                 and dq.is_quantity(rfq) \
@@ -488,7 +487,7 @@ class measures(_measures):
         """
         if is_measure(rfq) and rfq['type'] == 'frequency':
             rfq = dq.quantity(rfq['m0'])
-        elif isinstance(rfq, string_types):
+        elif isinstance(rfq, str):
             rfq = dq.quantity(rfq)
         if is_measure(v0):
             if v0['type'] == 'radialvelocity':
@@ -823,7 +822,7 @@ class measures(_measures):
         """
 
         a = self.rise(crd, ev)
-        if isinstance(a['rise'], string_types):
+        if isinstance(a['rise'], str):
             return {"rise": {"last": a[0], "utc": a[0]},
                     "set": {"last": a[1], "utc": a[1]},
                     "solved": False}

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/quanta/quantity.py

@@ -1,4 +1,3 @@
-from six import string_types
 from ._quanta import QuantVec
 from ._quanta import Quantity
 from ._quanta import from_string, from_dict, from_dict_v
@@ -52,7 +51,7 @@ def quantity(*args):
 
     """
     if len(args) == 1:
-        if isinstance(args[0], string_types):
+        if isinstance(args[0], str):
             # use copy constructor to create quantity from string
             return Quantity(from_string(args[0]))
         elif isinstance(args[0], dict):

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/tables/msutil.py

@@ -23,9 +23,6 @@
 #                        520 Edgemont Road
 #                        Charlottesville, VA 22903-2475 USA
 #
-from __future__ import print_function
-
-from six import string_types
 import numpy as np
 from casacore.tables.table import (table, taql,
                                    _required_ms_desc,
@@ -315,7 +312,7 @@ def msconcat(names, newname, concatTime=False):
     for key in keywords:
         if key != 'SORTED_TABLE':
             val = keywords[key]
-            if isinstance(val, string_types):
+            if isinstance(val, str):
                 tsub = table(val, ack=False)
                 tsubn = tsub.copy(newname + '/' + key, deep=True)
                 tnew.putkeyword(key, tsubn)

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/tables/table.py

@@ -36,9 +36,6 @@ Several utility functions exist. Important ones are:
 
 """
 
-from __future__ import print_function
-
-from six import string_types
 from ._tables import (Table,
                       _default_ms,
                       _default_ms_subtable,
@@ -47,8 +44,6 @@ from ._tables import (Table,
 
 from .tablehelper import (_add_prefix, _remove_prefix, _do_remove_prefix,
                           _format_row)
-import six
-
 
 def default_ms(name, tabdesc=None, dminfo=None):
     """
@@ -344,7 +339,7 @@ class table(Table):
             #  - concatenate open tables (ConcatTable)
             tabname = _remove_prefix(tablename)
             lockopt = lockoptions
-            if isinstance(lockoptions, string_types):
+            if isinstance(lockoptions, str):
                 lockopt = {'option': lockoptions}
             if isinstance(tabledesc, dict):
                 # Create a new table.
@@ -371,7 +366,7 @@ class table(Table):
                     opt = 5
                     if _delete:
                         opt = 6
-                if isinstance(tabname, string_types):
+                if isinstance(tabname, str):
                     Table.__init__(self, tabname, lockopt, opt)
                     if ack:
                         print('Successful', typstr, 'open of',
@@ -379,7 +374,7 @@ class table(Table):
                               tabname + ':',
                               self.ncols(), 'columns,',
                               self.nrows(), 'rows')
-                elif isinstance(tabname[0], string_types):
+                elif isinstance(tabname[0], str):
                     # Concatenate and open named tables.
                     Table.__init__(self, tabname, concatsubtables,
                                    lockopt, opt)
@@ -1277,7 +1272,7 @@ class table(Table):
         of the struct value of the i-th keyword.
 
         """
-        if isinstance(keyword, string_types):
+        if isinstance(keyword, str):
             return self._getfieldnames('', keyword, -1)
         else:
             return self._getfieldnames('', '', keyword)
@@ -1299,7 +1294,7 @@ class table(Table):
         of the struct value of the i-th keyword.
 
         """
-        if isinstance(keyword, string_types):
+        if isinstance(keyword, str):
             return self._getfieldnames(columnname, keyword, -1)
         else:
             return self._getfieldnames(columnname, '', keyword)
@@ -1327,7 +1322,7 @@ class table(Table):
         of the i-th keyword.
 
         """
-        if isinstance(keyword, string_types):
+        if isinstance(keyword, str):
             return self._getkeyword('', keyword, -1)
         else:
             return self._getkeyword('', '', keyword)
@@ -1338,7 +1333,7 @@ class table(Table):
         It is similar to :func:`getkeyword`.
 
         """
-        if isinstance(keyword, string_types):
+        if isinstance(keyword, str):
             return self._getkeyword(columnname, keyword, -1)
         else:
             return self._getkeyword(columnname, '', keyword)
@@ -1366,7 +1361,7 @@ class table(Table):
         keyset = self.getkeywords()
         names = []
         for key, value in keyset.items():
-            if isinstance(value, string_types) and value.find('Table: ') == 0:
+            if isinstance(value, str) and value.find('Table: ') == 0:
                 names.append(_do_remove_prefix(value))
         return names
 
@@ -1402,7 +1397,7 @@ class table(Table):
         val = value
         if isinstance(val, table):
             val = _add_prefix(val.name())
-        if isinstance(keyword, string_types):
+        if isinstance(keyword, str):
             return self._putkeyword('', keyword, -1, makesubrecord, val)
         else:
             return self._putkeyword('', '', keyword, makesubrecord, val)
@@ -1416,7 +1411,7 @@ class table(Table):
         val = value
         if isinstance(val, table):
             val = _add_prefix(val.name())
-        if isinstance(keyword, string_types):
+        if isinstance(keyword, str):
             return self._putkeyword(columnname, keyword, -1,
                                     makesubrecord, val)
         else:
@@ -1451,7 +1446,7 @@ class table(Table):
         the i-th keyword.
 
         """
-        if isinstance(keyword, string_types):
+        if isinstance(keyword, str):
             self._removekeyword('', keyword, -1)
         else:
             self._removekeyword('', '', keyword)
@@ -1462,7 +1457,7 @@ class table(Table):
         It is similar to :func:`removekeyword`.
 
         """
-        if isinstance(keyword, string_types):
+        if isinstance(keyword, str):
             self._removekeyword(columnname, keyword, -1)
         else:
             self._removekeyword(columnname, '', keyword)
@@ -1482,7 +1477,7 @@ class table(Table):
         # as these aren't valid. (See tabledefinehypercolumn)
         hcdefs = tabledesc.get('_define_hypercolumn_', {})
 
-        for c, hcdef in six.iteritems(hcdefs):
+        for c, hcdef in hcdefs.items():
             if "HCcoordnames" in hcdef and len(hcdef["HCcoordnames"]) == 0:
                 del hcdef["HCcoordnames"]
             if "HCidnames" in hcdef and len(hcdef["HCidnames"]) == 0:

{python_casacore-3.6.1 → python_casacore-3.7.1}/casacore/tables/tablehelper.py

@@ -25,7 +25,6 @@
 #
 # $Id: tableutil.py,v 1.6 2006/11/08 00:12:55 gvandiep Exp $
 
-from six import string_types, integer_types
 import numpy
 import re
 from ..quanta import quantity
@@ -42,7 +41,7 @@ def _add_prefix(name):
 def _do_remove_prefix(name):
     """Strip the possible prefix 'Table: ' from a table name."""
     res = name
-    if isinstance(res, string_types):
+    if isinstance(res, str):
         if res.find('Table: ') == 0:
             res = res.replace('Table: ', '', 1)
     return res
@@ -50,7 +49,7 @@ def _do_remove_prefix(name):
 
 def _remove_prefix(name):
     """Strip the possible prefix 'Table: ' from one or more table names."""
-    if isinstance(name, string_types):
+    if isinstance(name, str):
         return _do_remove_prefix(name)
     return [_do_remove_prefix(nm) for nm in name]
 
@@ -114,13 +113,13 @@ def _check_key_slice(key, nrows, name):
 def _value_type_name(value):
     if isinstance(value, bool):
         return 'boolean'
-    if isinstance(value, integer_types):
+    if isinstance(value, int):
         return 'integer'
     if isinstance(value, float):
         return 'double'
     if isinstance(value, complex):
         return 'dcomplex'
-    if isinstance(value, string_types):
+    if isinstance(value, str):
         return 'string'
     if isinstance(value, dict):
         return 'record'