import errors

kociemba/__init__.py

@@ -23,8 +23,8 @@ def _solve(s):
                   "project page for a native implementation: "
                   "https://github.com/muodov/kociemba",
                   SlowContextWarning)
-    import pykociemba.search
-    _solve = lambda s: pykociemba.search.Search().solution(s, 24, 1000, False).strip()
+    from .pykociemba import search
+    _solve = lambda s: search.Search().solution(s, 24, 1000, False).strip()
 
 
 def solve(cubestring):

kociemba/pykociemba/coordcube.py

@@ -1,13 +1,18 @@
 import logging
 import os.path
-import cPickle
+
+try:
+    import cPickle
+except ImportError:
+    import pickle as cPickle
 
 from .cubiecube import CubieCube, moveCube, getURtoDF
 
 log = logging.getLogger(__name__)
 
 cache_dir = os.path.join(os.path.dirname(__file__), 'prunetables')
 
+
 def setPruning(table, index, value):
     """Set pruning value in table. Two values are stored in one byte."""
     if ((index & 1) == 0):
@@ -16,6 +21,7 @@ def setPruning(table, index, value):
         table[index / 2] &= 0x0f | (value << 4)
     # table[index] = value & 0xf
 
+
 def getPruning(table, index):
     """Extract pruning value"""
 
@@ -26,6 +32,7 @@ def getPruning(table, index):
     return res
     # return table[index] & 0xf
 
+
 def load_cachetable(name):
     obj = None
     try:
@@ -35,6 +42,7 @@ def load_cachetable(name):
         log.warning('could not read cache for %s: %s. Recalculating it...', name, e)
     return obj
 
+
 def dump_cachetable(obj, name):
     with open(os.path.join(cache_dir, name + '.pkl'), 'w') as f:
         cPickle.dump(obj, f)
@@ -147,8 +155,8 @@ def move(self, m):
     # Parity of the corner permutation. This is the same as the parity for the edge permutation of a valid cube.
     # parity has values 0 and 1
     parityMove = [
-        [ 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1 ],
-        [ 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0 ],
+        [1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1],
+        [0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0],
     ]
 
     # ***********************************Phase 1 and 2 movetable********************************************************