from __future__ import absolute_import

# defaults and constants
from .utils import DEFAULT_PALETTE
from ._chart_options import default_options as defaults

# main components
from ._chart import Chart

# operations and attributes for users to input into Charts
from ._attributes import color, marker
from .operations import stack, blend

# builders
from .builder.line_builder import Line
from .builder.histogram_builder import Histogram
from .builder.bar_builder import Bar
from .builder.scatter_builder import Scatter
from .builder.boxplot_builder import BoxPlot

# easy access to required bokeh components
from ..models import ColumnDataSource
from ..io import (
    curdoc, cursession, output_file, output_notebook, output_server, push,
    reset_output, save, show, gridplot, vplot, hplot)

# Silence pyflakes
(curdoc, cursession, output_file, output_notebook, output_server, push,
 reset_output, save, show, gridplot, vplot, hplot, ColumnDataSource)


from __future__ import absolute_import

# defaults and constants
from .utils import DEFAULT_PALETTE
from ._chart_options import default_options as defaults

# main components
from ._chart import Chart

# operations and attributes for users to input into Charts
from ._attributes import color
from .operations import stack, blend

# builders
from .builder.line_builder import Line
from .builder.histogram_builder import Histogram
from .builder.bar_builder import Bar
from .builder.scatter_builder import Scatter
from .builder.boxplot_builder import BoxPlot

# easy access to required bokeh components
from ..models import ColumnDataSource
from ..io import (
    curdoc, cursession, output_file, output_notebook, output_server, push,
    reset_output, save, show, gridplot, vplot, hplot)

# Silence pyflakes
(curdoc, cursession, output_file, output_notebook, output_server, push,
 reset_output, save, show, gridplot, vplot, hplot, ColumnDataSource)


--- 
+++ 
@@ -8,7 +8,7 @@
 from ._chart import Chart
 
 # operations and attributes for users to input into Charts
-from ._attributes import color
+from ._attributes import color, marker
 from .operations import stack, blend
 
 # builders
Add marker attr spec function to chart import.
