Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy

nifty/plotting/descriptors/line.py

 # -*- coding: utf-8 -*-
 
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ..plotly_wrapper import PlotlyWrapper
 
 
 class Line(PlotlyWrapper):

nifty/plotting/descriptors/marker.py

 # -*- coding: utf-8 -*-
 
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ..plotly_wrapper import PlotlyWrapper
 
 
 class Marker(PlotlyWrapper):

nifty/plotting/figures/__init__.py

-from figure_2D import Figure2D
-from figure_3D import Figure3D
-from multi_figure import MultiFigure
+from .figure_2D import Figure2D
+from .figure_3D import Figure3D
+from .multi_figure import MultiFigure

nifty/plotting/figures/figure_2D.py

 # -*- coding: utf-8 -*-
 
-from figure_from_plot import FigureFromPlot
-from nifty.plotting.plots import Heatmap, HPMollweide, GLMollweide
+from .figure_from_plot import FigureFromPlot
+from ..plots import Heatmap, HPMollweide, GLMollweide
 
 
 class Figure2D(FigureFromPlot):

nifty/plotting/figures/figure_3D.py

 # -*- coding: utf-8 -*-
-from figure_from_plot import FigureFromPlot
+
+from .figure_from_plot import FigureFromPlot
 
 
 class Figure3D(FigureFromPlot):

nifty/plotting/figures/figure_base.py

@@ -2,7 +2,7 @@
 
 import abc
 
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ..plotly_wrapper import PlotlyWrapper
 
 
 class FigureBase(PlotlyWrapper):

nifty/plotting/figures/figure_from_plot.py

 # -*- coding: utf-8 -*-
 
-# -*- coding: utf-8 -*-
-
-from figure_base import FigureBase
+from .figure_base import FigureBase
 
 
 class FigureFromPlot(FigureBase):

nifty/plotting/figures/multi_figure.py

 # -*- coding: utf-8 -*-
 
+from builtins import map
+from builtins import str
 import numpy as np
-from nifty import dependency_injector as gdi
-from figure_base import FigureBase
-from figure_3D import Figure3D
+from ... import dependency_injector as gdi
+from .figure_base import FigureBase
+from .figure_3D import Figure3D
 
 plotly = gdi.get('plotly')
 

nifty/plotting/plotly_wrapper.py

+from builtins import object
 from abc import ABCMeta, abstractmethod
-from nifty.nifty_meta import NiftyMeta
+from ..nifty_meta import NiftyMeta
+from future.utils import with_metaclass
 
 
-class PlotlyWrapper(object):
-    __metaclass__ = NiftyMeta
-
+class PlotlyWrapper(with_metaclass(NiftyMeta, object)):
     @abstractmethod
     def to_plotly(self):
         return {}

nifty/plotting/plots/__init__.py

-from scatter_plots import *
-from heatmaps import *
+from .scatter_plots import *
+from .heatmaps import *

nifty/plotting/plots/heatmaps/__init__.py

 # -*- coding: utf-8 -*-
 
-from hpmollweide import HPMollweide
-from glmollweide import GLMollweide
-from heatmap import Heatmap
+from .hpmollweide import HPMollweide
+from .glmollweide import GLMollweide
+from .heatmap import Heatmap

nifty/plotting/plots/heatmaps/glmollweide.py

 # -*- coding: utf-8 -*-
 
-from nifty import dependency_injector as gdi
-from heatmap import Heatmap
+from .... import dependency_injector as gdi
+from .heatmap import Heatmap
 import numpy as np
 
-from nifty.plotting.descriptors import Axis
+from ...descriptors import Axis
 
 from .mollweide_helper import mollweide_helper
 

nifty/plotting/plots/heatmaps/heatmap.py

@@ -2,9 +2,9 @@
 
 import numpy as np
 
-from nifty.plotting.descriptors import Axis
-from nifty.plotting.colormap import Colormap
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ...descriptors import Axis
+from ...colormap import Colormap
+from ...plotly_wrapper import PlotlyWrapper
 
 
 class Heatmap(PlotlyWrapper):

nifty/plotting/plots/heatmaps/hpmollweide.py

 # -*- coding: utf-8 -*-
 
-from nifty import dependency_injector as gdi
-from heatmap import Heatmap
+from __future__ import division
+from .... import dependency_injector as gdi
+from .heatmap import Heatmap
 import numpy as np
 
-from nifty.plotting.descriptors import Axis
+from ...descriptors import Axis
 
 from .mollweide_helper import mollweide_helper
 
@@ -41,7 +42,7 @@ class HPMollweide(Heatmap):
         ptg = np.empty((phi.size, 2), dtype=np.float64)
         ptg[:, 0] = theta
         ptg[:, 1] = phi
-        base = pyHealpix.Healpix_Base(int(np.sqrt(x.size/12)), "RING")
+        base = pyHealpix.Healpix_Base(int(np.sqrt(x.size//12)), "RING")
         res[mask] = x[base.ang2pix(ptg)]
         return res
 

nifty/plotting/plots/heatmaps/mollweide_helper.py

 # -*- coding: utf-8 -*-
 
+from __future__ import division
 import numpy as np
 
 
 def mollweide_helper(xsize):
     xsize = int(xsize)
-    ysize = int(xsize/2)
+    ysize = xsize//2
     res = np.full(shape=(ysize, xsize), fill_value=np.nan,
                   dtype=np.float64)
     xc = (xsize-1)*0.5

nifty/plotting/plots/scatter_plots/__init__.py

 # -*- coding: utf-8 -*-
 
-from cartesian_2D import Cartesian2D
-from cartesian_3D import Cartesian3D
-from geo import Geo
+from .cartesian_2D import Cartesian2D
+from .cartesian_3D import Cartesian3D
+from .geo import Geo

nifty/plotting/plots/scatter_plots/cartesian.py

 # -*- coding: utf-8 -*-
 from abc import abstractmethod
-from scatter_plot import ScatterPlot
+from .scatter_plot import ScatterPlot
 
 
 class Cartesian(ScatterPlot):

nifty/plotting/plots/scatter_plots/cartesian_2D.py

 # -*- coding: utf-8 -*-
 
-from nifty.plotting.descriptors import Axis
-from cartesian import Cartesian
+from ...descriptors import Axis
+from .cartesian import Cartesian
 
 
 class Cartesian2D(Cartesian):

nifty/plotting/plots/scatter_plots/cartesian_3D.py

 # -*- coding: utf-8 -*-
 
-from nifty.plotting.descriptors import Axis
-from cartesian import Cartesian
+from ...descriptors import Axis
+from .cartesian import Cartesian
 
 
 class Cartesian3D(Cartesian):

nifty/plotting/plots/scatter_plots/geo.py

-
-from nifty.plotting.descriptors import Axis
-from scatter_plot import ScatterPlot
+from ...descriptors import Axis
+from .scatter_plot import ScatterPlot
 
 
 class Geo(ScatterPlot):