remove deprecated things

adrn · Nov 8, 2019 · 65a7ad7 · 65a7ad7
1 parent ec36aa7
commit 65a7ad7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/superfreq/log.py b/superfreq/log.py
@@ -2,7 +2,6 @@
 import logging
 
 # Third-party
-from astropy.extern.six import PY3
 from astropy.logger import StreamHandler
 from astropy.utils import find_current_module
 
@@ -40,14 +39,9 @@ def makeRecord(self, name, level, pathname, lineno, msg, args, exc_info,
             else:
                 extra['origin'] = 'unknown'
 
-        if PY3:
-            return Logger.makeRecord(self, name, level, pathname, lineno, msg,
-                                     args, exc_info, func=func, extra=extra,
-                                     sinfo=sinfo)
-        else:
-            return Logger.makeRecord(self, name, level, pathname, lineno, msg,
-                                     args, exc_info, func=func, extra=extra)
-
+        return Logger.makeRecord(self, name, level, pathname, lineno, msg,
+                                    args, exc_info, func=func, extra=extra,
+                                    sinfo=sinfo)
 
 logging.setLoggerClass(SFLogger)
 logger = logging.getLogger('superfreq')

diff --git a/superfreq/tests/data/generate.py b/superfreq/tests/data/generate.py
@@ -60,7 +60,7 @@ def get_isochrone_orbits(n_orbits=100, seed=42):
     vel = np.vstack((vx, vy, vz))*galactic['length']/galactic['time']
 
     # compute true actions, true frequencies
-    w0 = gd.CartesianPhaseSpacePosition(pos=pos, vel=vel)
+    w0 = gd.PhaseSpacePosition(pos=pos, vel=vel)
     act, ang, frq = pot.action_angle(w0)
 
     # reshape down to 2d
@@ -139,7 +139,7 @@ def get_harmonic_oscillator_orbits(n_orbits=100, seed=42):
     vel = np.zeros((3, n_orbits))*galactic['length']/galactic['time']
 
     # compute true actions, true frequencies
-    w0 = gd.CartesianPhaseSpacePosition(pos=pos, vel=vel)
+    w0 = gd.PhaseSpacePosition(pos=pos, vel=vel)
     act, ang, frq = pot.action_angle(w0)
     frq = np.repeat(frq[:,np.newaxis], axis=1, repeats=n_orbits)
 

diff --git a/superfreq/tests/test_core.py b/superfreq/tests/test_core.py
@@ -13,7 +13,7 @@
 
 def test_orbit_to_fs():
     potential = gp.NFWPotential(m=1E12, r_s=15, b=0.9, c=0.8, units=galactic)
-    w0 = gd.CartesianPhaseSpacePosition(pos=[1.,0,0]*u.kpc,
+    w0 = gd.PhaseSpacePosition(pos=[1.,0,0]*u.kpc,
                                         vel=[30.,150,71]*u.km/u.s)
     P = 40*u.Myr
     orbit = potential.integrate_orbit(w0, dt=P/128, t1=0*u.Myr, t2=P*128,