Merge branch 'master' of https://github.com/matplotlib/cmocean

Author: kthyng

cmocean/__init__.py

@@ -6,9 +6,9 @@
 '''
 
 # from cmocean import *
-import cm
-import tools
-import plots
-import data
+from cmocean import cm
+from cmocean import tools
+from cmocean import plots
+from cmocean import data
 
 __authors__ = ['Kristen Thyng <[email protected]>']

cmocean/cm.py

@@ -20,7 +20,7 @@
 '''
 
 # from matplotlib import cm, colors
-import tools
+from cmocean import tools
 import matplotlib
 # import plotting
 # import data

cmocean/plots.py

@@ -2,11 +2,11 @@
 Plots with colormaps.
 '''
 
-import cm
+from cmocean import cm
 import matplotlib.pyplot as plt
 import numpy as np
 import matplotlib as mpl
-import tools
+from cmocean import tools
 # from skimage import color