Replaced built-in six with external six module

pymc/CommonDeterministics.py

@@ -33,7 +33,7 @@
     def UnboundMethodType(func, inst, cls):
         return func
 
-from . import six
+import six
 xrange = six.moves.xrange
 
 __all__ = [

pymc/Container.py

@@ -42,7 +42,7 @@ def __init__(self):
 from types import ModuleType
 import pdb
 
-from . import six
+import six
 xrange = six.moves.xrange
 
 __all__ = [

pymc/InstantiationDecorators.py

@@ -41,7 +41,7 @@ def enable_special_methods(sma=special_methods_available):
 def check_special_methods(sma=special_methods_available):
     return sma[0]
 
-from . import six
+import six
 
 
 def _extract(__func__, kwds, keys, classname, probe=True):

pymc/MCMC.py

@@ -14,7 +14,7 @@
 from .utils import crawl_dataless
 import warnings
 
-from .six import print_
+from six import print_
 
 # from .progressbar import ProgressBar, Percentage, Bar, ETA, Iterations
 from .progressbar import progress_bar as pbar

pymc/Matplot.py

@@ -28,8 +28,8 @@
     special = None
 from scipy.stats import kurtosis
 
-from . import six
-from .six import print_
+import six
+from six import print_
 
 __all__ = ['func_quantiles', 'func_envelopes', 'func_sd_envelope',
            'centered_envelope', 'get_index_list', 'plot', 'histogram', 'trace',

pymc/Model.py

@@ -29,7 +29,7 @@
 import traceback
 import itertools
 
-from .six import print_, reraise
+from six import print_, reraise
 
 GuiInterrupt = 'Computation halt'
 Paused = 'Computation paused'

pymc/Node.py

@@ -11,7 +11,7 @@
 import pdb
 import numpy as np
 import types
-from . import six
+import six
 print_ = six.print_
 
 try:

pymc/NormalApproximation.py

@@ -11,8 +11,8 @@
 from .utils import msqrt, check_type, round_array, logp_of_set
 from copy import copy
 
-from . import six
-from .six import print_
+import six
+from six import print_
 xrange = six.moves.xrange
 
 try:

pymc/NumpyDeterministics.py

@@ -9,7 +9,7 @@
 from .utils import find_element, get_signature
 import inspect
 
-from . import six
+import six
 xrange = six.moves.xrange
 
 # accumulations

pymc/PyMCObjects.py

@@ -26,8 +26,8 @@
 
 from . import datatypes
 
-from . import six
-from .six import print_
+import six
+from six import print_
 
 d_neg_inf = float(-1.7976931348623157e+308)
 

pymc/StepMethods.py

@@ -22,8 +22,8 @@
 import sys
 import inspect
 
-from . import six
-from .six import print_
+import six
+from six import print_
 
 __docformat__ = 'reStructuredText'
 

pymc/__init__.py

@@ -21,7 +21,7 @@
 import pymc
 if os.getcwd().find(
         os.path.abspath(os.path.split(os.path.split(pymc.__file__)[0])[0])) > -1:
-    from .six import print_
+    from six import print_
     print_('\n\tWarning: You are importing PyMC from inside its source tree.')
 from .Node import *
 from .Container import *

pymc/database/base.py

@@ -56,7 +56,7 @@
 
 from pymc import six
 from pymc import utils
-from pymc.six import print_
+from six import print_
 
 
 class Trace(object):

pymc/database/txt.py

@@ -30,7 +30,7 @@
 import string
 
 from pymc import six
-from pymc.six import print_
+from six import print_
 
 
 __all__ = ['Trace', 'Database', 'load']

pymc/diagnostics.py

@@ -11,8 +11,8 @@
 except ImportError:
     has_sm = False
 
-from . import six
-from .six import print_
+import six
+from six import print_
 xrange = six.moves.xrange
 
 __all__ = [

pymc/distributions.py

@@ -40,8 +40,8 @@
 from . import utils
 import warnings
 
-from . import six
-from .six import print_
+import six
+from six import print_
 xrange = six.moves.xrange
 
 

pymc/gp/GPutils.py

@@ -19,7 +19,7 @@
 import pymc
 
 from pymc import six
-from pymc.six import print_
+from six import print_
 xrange = six.moves.xrange
 
 try:

pymc/gp/step_methods.py

@@ -11,7 +11,7 @@
 import warnings
 
 from pymc import six
-from pymc.six import print_
+from six import print_
 xrange = six.moves.xrange
 
 from .Realization import Realization