Partial commit, continue converting wrappers

Author: lukelbd

proplot/axes/__init__.py

@@ -4,12 +4,11 @@
 """
 import matplotlib.projections as mproj
 
-from . import plot
 from .base import Axes  # noqa: F401
 from .cartesian import CartesianAxes
 from .geo import GeoAxes  # noqa: F401
 from .geo import BasemapAxes, CartopyAxes
-from .plot import *  # noqa: F401, F403
+from .plot import PlotAxes  # noqa: F401
 from .polar import PolarAxes
 from .three import Axes3D  # noqa: F401
 
@@ -22,11 +21,11 @@
 # Prevent importing module names and set order of appearance for objects
 __all__ = [
     'Axes',
+    'PlotAxes',
     'CartesianAxes',
     'PolarAxes',
     'GeoAxes',
     'CartopyAxes',
     'BasemapAxes',
     'Axes3D',
 ]
-__all__.extend(plot.__all__)  # document wrappers as part of proplot/axes submodule

proplot/axes/base.py

@@ -13,7 +13,7 @@
 from ..internals import ic  # noqa: F401
 from ..internals import _not_none, docstring, rcsetup, warnings
 from ..utils import units
-from . import base
+from . import plot
 
 __all__ = ['CartesianAxes']
 
@@ -196,7 +196,7 @@ def _parse_rcloc(x, string):  # figures out string location
             return 'neither'
 
 
-class CartesianAxes(base.Axes):
+class CartesianAxes(plot.PlotAxes):
     """
     Axes subclass for plotting in ordinary Cartesian coordinates.
     Adds the `~CartesianAxes.format` method and overrides several existing
@@ -210,6 +210,8 @@ def __init__(self, *args, **kwargs):
         See also
         --------
         proplot.ui.subplots
+        proplot.axes.Axes
+        proplot.axes.PlotAxes
         """
         # Impose default formatter
         super().__init__(*args, **kwargs)
@@ -1015,7 +1017,7 @@ def format(
 
         Other parameters
         ----------------
-        %(axes.other)s
+        %(axes.format_other)s
 
         See also
         --------