remove past and future

Author: PreisTo

astromodels/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import os
 
 from ._version import get_versions

astromodels/core/serialization.py

@@ -1,9 +1,6 @@
-from future import standard_library
-
 from astromodels.core.model import Model
 from astromodels.core.model_parser import ModelParser
 
-standard_library.install_aliases()
 # We do not want to actually import anything from this module
 __all__ = []
 

astromodels/core/tree.py

@@ -1,15 +1,11 @@
 import collections
 from typing import Any, Dict
 
-from future import standard_library
-
 from astromodels.core.node_type import NodeBase
 from astromodels.utils.io import display
 from astromodels.utils.logging import setup_logger
 from astromodels.utils.valid_variable import is_valid_variable_name
 
-standard_library.install_aliases()
-
 
 class DuplicatedNode(Exception):
     pass

astromodels/functions/dark_matter/dm_models.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import astropy.units as astropy_units
 import numpy as np
 from scipy.interpolate import RegularGridInterpolator

astromodels/functions/functions_1D/blackbody.py

@@ -1,7 +1,4 @@
-from __future__ import division
-
 import astropy.units as astropy_units
-from past.utils import old_div
 
 import astromodels.functions.numba_functions as nb_func
 from astromodels.functions.function import (
@@ -34,7 +31,7 @@ class Blackbody(Function1D, metaclass=FunctionMeta):
 
     def _set_units(self, x_unit, y_unit):
         # The normalization has the same units as y
-        self.K.unit = old_div(y_unit, (x_unit**2))
+        self.K.unit = y_unit / (x_unit**2)
 
         # The break point has always the same dimension as the x variable
         self.kT.unit = x_unit

astromodels/functions/functions_1D/functions.py

@@ -1,9 +1,6 @@
-from __future__ import division
-
 import astropy.units as astropy_units
 import astropy.units as u
 import numpy as np
-from past.utils import old_div
 
 from astromodels.core.units import get_units
 from astromodels.functions.function import Function1D, FunctionMeta
@@ -448,8 +445,8 @@ def set_particle_distribution(self, function):
             # returns an astropy quantity, so we need to create a wrapper which will
             # remove the unit from x and add the unit to the return value
 
-            self._particle_distribution_wrapper = lambda x: old_div(
-                function(x.value), current_units.energy
+            self._particle_distribution_wrapper = (
+                lambda x: function(x.value) / current_units.energy
             )
 
         def get_particle_distribution(self):
@@ -552,7 +549,7 @@ class _ComplexTestFunction(Function1D, metaclass=FunctionMeta):
     def _set_units(self, x_unit, y_unit):
 
         self.A.unit = y_unit
-        self.B.unit = old_div(y_unit, x_unit)
+        self.B.unit = y_unit / x_unit
 
     def set_particle_distribution(self, function):
 
@@ -680,7 +677,7 @@ def peak_energy(self):
 
         return self.piv.value * pow(
             10,
-            old_div(((2 + self.alpha.value) * np.log(10)), (2 * self.beta.value)),
+            ((2 + self.alpha.value) * np.log(10)) / (2 * self.beta.value),
         )
 
 
@@ -745,7 +742,7 @@ def _integral(a, b, index, ec):
             ap1 = index + 1
 
             def integrand(x):
-                return -pow(ec, ap1) * gamma_inc(ap1, old_div(x, ec))
+                return -pow(ec, ap1) * gamma_inc(ap1, x / ec)
 
             return integrand(b) - integrand(a)
 

astromodels/functions/functions_1D/powerlaws.py

@@ -1,6 +1,5 @@
 import astropy.units as astropy_units
 import numpy as np
-from past.utils import old_div
 from scipy.special import gamma, gammaincc
 
 import astromodels.functions.numba_functions as nb_func
@@ -805,7 +804,7 @@ def _set_units(self, x_unit, y_unit):
         self.beta.unit = astropy_units.dimensionless_unscaled
 
     def evaluate(self, x, K, alpha, xp, beta, piv):
-        E0 = old_div(xp, (2 + alpha))
+        E0 = xp / (2 + alpha)
 
         if alpha < beta:
             alpha = beta
@@ -900,14 +899,12 @@ def evaluate(self, x, K, alpha, xc, beta, piv):
 
         out = np.zeros(x.shape) * K * 0
 
-        out[idx] = (
-            K * np.power(old_div(x[idx], piv), alpha) * np.exp(old_div(-x[idx], xc))
-        )
+        out[idx] = K * np.power(x[idx] / piv, alpha) * np.exp(-x[idx] / xc)
         out[~idx] = (
             K
             * np.power((alpha - beta) * xc / piv, alpha - beta)
             * np.exp(beta - alpha)
-            * np.power(old_div(x[~idx], piv), beta)
+            * np.power(x[~idx] / piv, beta)
         )
 
         return out
@@ -1004,8 +1001,8 @@ def _set_units(self, x_unit, y_unit):
     def ggrb_int_cpl(a, Ec, Emin, Emax):
 
         # Gammaincc does not support quantities
-        i1 = gammaincc(2 + a, old_div(Emin, Ec)) * gamma(2 + a)
-        i2 = gammaincc(2 + a, old_div(Emax, Ec)) * gamma(2 + a)
+        i1 = gammaincc(2 + a, Emin / Ec) * gamma(2 + a)
+        i2 = gammaincc(2 + a, Emax / Ec) * gamma(2 + a)
 
         return -Ec * Ec * (i2 - i1)
 
@@ -1023,11 +1020,11 @@ def evaluate(self, x, alpha, beta, xp, F, a, b, opt):
 
         if alpha == -2:
 
-            Ec = old_div(xp, 0.0001)  # TRICK: avoid a=-2
+            Ec = xp / 0.0001  # TRICK: avoid a=-2
 
         else:
 
-            Ec = old_div(xp, (2 + alpha))
+            Ec = xp / (2 + alpha)
 
         # Split energy
 
@@ -1095,9 +1092,6 @@ def evaluate(self, x, alpha, beta, xp, F, a, b, opt):
 
             flux = nb_func.cplaw_eval(x_, 1.0, Ec_, alpha_, Ec_)
 
-            # flux = norm * np.power(old_div(x, Ec), alpha) * \
-            #     np.exp(old_div(- x, Ec))
-
         else:
 
             # The norm * 0 is to keep the units right

astromodels/functions/functions_2D.py

@@ -1,13 +1,10 @@
-from __future__ import division
-
 import hashlib
 
 import astropy.units as u
 import numpy as np
 from astropy import wcs
 from astropy.coordinates import ICRS, BaseCoordinateFrame, SkyCoord
 from astropy.io import fits
-from past.utils import old_div
 
 from astromodels.functions.function import Function2D, FunctionMeta
 from astromodels.utils.angular_distance import angular_distance
@@ -83,7 +80,7 @@ def evaluate(self, x, y, K, sigma_b, l_min, l_max):
 
         return (
             K
-            * np.exp(old_div(-(b**2), (2 * sigma_b**2)))
+            * np.exp(-(b**2) / (2 * sigma_b**2))
             * np.logical_or(
                 np.logical_and(l > l_min, l < l_max),
                 np.logical_and(l_min > l_max, np.logical_or(l > l_min, l < l_max)),
@@ -193,10 +190,7 @@ def evaluate(self, x, y, lon0, lat0, sigma):
         s2 = sigma**2
 
         return (
-            (old_div(180, np.pi)) ** 2
-            * 1
-            / (2.0 * np.pi * s2)
-            * np.exp(-0.5 * angsep**2 / s2)
+            (180 / np.pi) ** 2 * 1 / (2.0 * np.pi * s2) * np.exp(-0.5 * angsep**2 / s2)
         )
 
     def get_boundaries(self):
@@ -340,15 +334,15 @@ def evaluate(self, x, y, lon0, lat0, a, e, theta):
 
         sin_2phi = np.sin(2.0 * phi * np.pi / 180.0)
 
-        A = old_div(cos2_phi, (2.0 * b**2)) + old_div(sin2_phi, (2.0 * a**2))
+        A = cos2_phi / (2.0 * b**2) + sin2_phi / (2.0 * a**2)
 
-        B = old_div(-sin_2phi, (4.0 * b**2)) + old_div(sin_2phi, (4.0 * a**2))
+        B = -sin_2phi / (4.0 * b**2) + sin_2phi / (4.0 * a**2)
 
-        C = old_div(sin2_phi, (2.0 * b**2)) + old_div(cos2_phi, (2.0 * a**2))
+        C = sin2_phi / (2.0 * b**2) + cos2_phi / (2.0 * a**2)
 
         E = -A * np.power(dX, 2) + 2.0 * B * dX * dY - C * np.power(dY, 2)
 
-        return np.power(old_div(180, np.pi), 2) * 1.0 / (2 * np.pi * a * b) * np.exp(E)
+        return np.power(180 / np.pi, 2) * 1.0 / (2 * np.pi * a * b) * np.exp(E)
 
     def get_boundaries(self):
 
@@ -452,12 +446,7 @@ def evaluate(self, x, y, lon0, lat0, radius):
 
         angsep = angular_distance(lon0, lat0, lon, lat)
 
-        return (
-            np.power(old_div(180, np.pi), 2)
-            * 1.0
-            / (np.pi * radius**2)
-            * (angsep <= radius)
-        )
+        return np.power(180 / np.pi, 2) * 1.0 / (np.pi * radius**2) * (angsep <= radius)
 
     def get_boundaries(self):
 
@@ -614,9 +603,7 @@ def evaluate(self, x, y, lon0, lat0, a, e, theta):
         angsep2 = angular_distance(self.lon2, self.lat2, lon, lat)
         angsep = angsep1 + angsep2
 
-        return (
-            np.power(old_div(180, np.pi), 2) * 1.0 / (np.pi * a * b) * (angsep <= 2 * a)
-        )
+        return np.power(180 / np.pi, 2) * 1.0 / (np.pi * a * b) * (angsep <= 2 * a)
 
     def get_boundaries(self):