Various unicode fixes for dimensions, Tables and widgets

holoviews/__init__.py

@@ -1,4 +1,5 @@
-from __future__ import print_function, absolute_import
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import os, sys, re, pydoc
 
 import numpy as np # pyflakes:ignore (API import)

holoviews/core/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from .boundingregion import *  # pyflakes:ignore (API import)
 from .data import *            # pyflakes:ignore (API import)
 from .dimension import *       # pyflakes:ignore (API import)

holoviews/core/boundingregion.py

@@ -3,6 +3,8 @@
 
 File originally part of the Topographica project.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 ### JABALERT: The aarect information should probably be rewritten in
 ### matrix notation, not list notation, so that it can be scaled,
 ### translated, etc. easily.

holoviews/core/data.py

@@ -2,6 +2,7 @@
 The data module provides utility classes to interface with various data
 backends.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 import sys
 from distutils.version import LooseVersion

holoviews/core/dimension.py

@@ -3,6 +3,8 @@
 axis or map dimension. Also supplies the Dimensioned abstract
 baseclass for classes that accept Dimension values.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import re
 from operator import itemgetter
 
@@ -11,7 +13,8 @@
 
 from ..core.util import (basestring, sanitize_identifier,
                          group_sanitizer, label_sanitizer, max_range,
-                         find_range, dimension_sanitizer, OrderedDict)
+                         find_range, dimension_sanitizer, safe_unicode,
+			 OrderedDict)
 from .options import Store, StoreOptions
 from .pprint import PrettyPrinter
 

holoviews/core/element.py

@@ -1,8 +1,10 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import operator
 from itertools import groupby, cycle
 from numbers import Number
-import numpy as np
 
+import numpy as np
 import param
 
 from .dimension import Dimension, Dimensioned, ViewableElement

holoviews/core/io.py

@@ -12,7 +12,7 @@
           objects for a report then generating a PDF or collecting
           HoloViews objects to dump to HDF5.
 """
-from __future__ import absolute_import
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 import re, os, time, string, zipfile, tarfile, shutil, itertools, pickle
 from collections import defaultdict

holoviews/core/layout.py

@@ -4,6 +4,7 @@
 AdjointLayout allows one or two Views to be ajoined to a primary View
 to act as supplementary elements.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 from functools import reduce
 from itertools import chain

holoviews/core/ndmapping.py

@@ -3,6 +3,7 @@
 map types. The former class only allows indexing whereas the latter
 also enables slicing over multiple dimension ranges.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 from collections import Sequence
 from itertools import cycle

holoviews/core/options.py

@@ -32,6 +32,8 @@
    extension together.
 
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import pickle
 from contextlib import contextmanager
 

holoviews/core/overlay.py

@@ -6,6 +6,7 @@
 Also supplies ViewMap which is the primary multi-dimensional Map type
 for indexing, slicing and animating collections of Views.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 from functools import reduce
 import numpy as np

holoviews/core/spaces.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from numbers import Number
 import itertools
 import numpy as np

holoviews/core/util.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import os, sys, warnings, operator
 import numbers
 import itertools

holoviews/element/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from ..core import ViewableElement
 from .annotation import * # pyflakes:ignore (API import)
 from .chart import * # pyflakes:ignore (API import)

holoviews/element/annotation.py

@@ -1,5 +1,6 @@
-import numpy as np
+from __future__ import unicode_literals, division, absolute_import, print_function
 
+import numpy as np
 import param
 
 from ..core import Dimension, Element2D

holoviews/element/chart.py

@@ -1,5 +1,6 @@
-import numpy as np
+from __future__ import unicode_literals, division, absolute_import, print_function
 
+import numpy as np
 import param
 
 from ..core import util

holoviews/element/chart3d.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import param
 
 from ..core import Dimension, Element3D

holoviews/element/comparison.py

@@ -17,6 +17,8 @@
 thus would not supply any information regarding *why* two elements are
 considered different.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import numpy as np
 from unittest.util import safe_repr
 from unittest import TestCase

holoviews/element/raster.py

@@ -1,6 +1,9 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import warnings
 from operator import itemgetter
 from itertools import product
+
 import numpy as np
 import colorsys
 import param

holoviews/element/tabular.py

@@ -1,9 +1,11 @@
-import numpy as np
+from __future__ import unicode_literals, division, absolute_import, print_function
 
+import numpy as np
 import param
 
 from ..core import (OrderedDict, Dimension, Element, Columns,
                     Tabular, NdElement, HoloMap)
+from ..core.util import safe_unicode
 
 
 class ItemTable(Element):
@@ -102,7 +104,7 @@ def pprint_cell(self, row, col):
         elif row >= self.rows:
             raise Exception("Maximum row index is %d" % self.rows-1)
         elif col == 0:
-            return str(self.dimensions('value')[row])
+            return safe_unicode(self.dimensions('value')[row])
         else:
             dim = self.get_dimension(row)
             heading = self.vdims[row]

holoviews/element/util.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import numpy as np
 
 try:

holoviews/interface/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from ..core import Dimensioned, AttrTree
 
 try:

holoviews/interface/collector.py

@@ -2,10 +2,11 @@
 AttributeTree, Collector and related classes offer optional functionality
 for holding and collecting DataView objects.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import uuid
 
 import numpy as np
-
 import param
 
 from ..core import Dimension, ViewableElement, UniformNdMapping,\

holoviews/interface/pandas.py

@@ -6,8 +6,7 @@
 provides methods to apply operations to the underlying data and
 convert it to standard HoloViews View types.
 """
-
-from __future__ import absolute_import
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 import numpy as np
 

holoviews/interface/seaborn.py

@@ -3,11 +3,9 @@
 of Seaborn plot types including time series, kernel density
 estimates, distributions and regression plots.
 """
-
-from __future__ import absolute_import
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 import numpy as np
-
 import param
 
 from ..core import Dimension, NdMapping, Element2D, HoloMap

holoviews/ipython/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import os
 import base64
 from unittest import SkipTest

holoviews/ipython/archive.py

@@ -2,9 +2,9 @@
 Implements NotebookArchive used to automatically capture notebook data
 and export it to disk via the display hooks.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
 
-import time, sys, os, traceback
-import io
+import time, sys, os, traceback, io
 
 from IPython import version_info
 from IPython.display import Javascript, display

holoviews/ipython/display_hooks.py

@@ -1,6 +1,8 @@
 """
 Definition and registration of display hooks for the IPython Notebook.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from functools import wraps
 import sys, traceback, inspect, io
 
@@ -13,9 +15,9 @@
                     HoloMap, AdjointLayout, NdLayout, GridSpace, Layout,
                     CompositeOverlay, DynamicMap)
 from ..core.traversal import unique_dimkeys, bijective
+from .archive import notebook_archive
 from .magics import OutputMagic, OptsMagic
 
-from .archive import notebook_archive
 # To assist with debugging of display hooks
 FULL_TRACEBACK = None
 ABBREVIATE_TRACEBACKS = True

holoviews/ipython/magics.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import time
 from collections import defaultdict
 

holoviews/ipython/parser.py

@@ -8,11 +8,14 @@
 Pyparsing is required by matplotlib and will therefore be available if
 HoloViews is being used in conjunction with matplotlib.
 """
-import param
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from itertools import groupby
+
+import param
 import pyparsing as pp
 
-from holoviews.core.options import Options
+from ..core.options import Options
 from ..operation import Compositor
 
 ascii_uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'

holoviews/ipython/widgets.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import sys, math, time
 from unittest import SkipTest
 

holoviews/operation/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from ..core.operation import ElementOperation, MapOperation, TreeOperation # pyflakes:ignore (API import)
 from ..core.options import Compositor
 

holoviews/operation/element.py

@@ -2,9 +2,9 @@
 Collection of either extremely generic or simple ElementOperation
 examples.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 import numpy as np
-
 import param
 from param import _is_number
 

holoviews/operation/normalization.py

@@ -12,8 +12,10 @@
 normalizations result in transformations to the stored data within
 each element.
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 import param
+
 from ..core.operation import ElementOperation
 from ..element import Raster
 from ..core import Overlay

holoviews/plotting/__init__.py

@@ -5,6 +5,7 @@
 This file defines the HTML tags used to wrap renderered output for
 display in the IPython Notebook (optional).
 """
+from __future__ import unicode_literals, division, absolute_import, print_function
 
 from ..core.options import Cycle
 from .plot import Plot

holoviews/plotting/bokeh/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from ...core import (Store, Overlay, NdOverlay, Layout, AdjointLayout,
                      GridSpace, NdElement, Columns, GridMatrix, NdLayout)
 from ...element import (Curve, Points, Scatter, Image, Raster, Path,

holoviews/plotting/bokeh/callbacks.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from collections import defaultdict
 
 import numpy as np

holoviews/plotting/bokeh/chart.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import numpy as np
 from bokeh.models import Circle
 import param

holoviews/plotting/bokeh/element.py

@@ -1,18 +1,19 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from io import BytesIO
+from distutils.version import LooseVersion
 
+import param
 import numpy as np
 import bokeh
 import bokeh.plotting
 from bokeh.models import Range, HoverTool, Renderer
 from bokeh.models.tickers import Ticker, BasicTicker, FixedTicker
 from bokeh.models.widgets import Panel, Tabs
-from distutils.version import LooseVersion
-
 try:
     from bokeh import mpl
 except ImportError:
     mpl = None
-import param
 
 from ...core import Store, HoloMap, Overlay, CompositeOverlay
 from ...core import util

holoviews/plotting/bokeh/path.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 import numpy as np
 
 from .element import ElementPlot, line_properties, fill_properties

holoviews/plotting/bokeh/plot.py

@@ -1,8 +1,9 @@
+from __future__ import unicode_literals, division, absolute_import, print_function
+
 from itertools import groupby
-import numpy as np
 
 import param
-
+import numpy as np
 from bokeh.io import gridplot, vplot, hplot
 from bokeh.models import ColumnDataSource, VBox, HBox, GridPlot as BokehGridPlot
 from bokeh.models.widgets import Panel, Tabs, DataTable