move MAX_ITEMS, MAX_BYTES to session from serialize

minrk · minrk · commit 925061af4e3d · 2015-03-27T17:42:12.000-07:00
diff --git a/IPython/kernel/zmq/serialize.py b/IPython/kernel/zmq/serialize.py
@@ -17,6 +17,8 @@
     can, uncan, can_sequence, uncan_sequence, CannedObject,
     istype, sequence_types, PICKLE_PROTOCOL,
 )
+from .session import MAX_ITEMS, MAX_BYTES
+
 
 if PY3:
     buffer = memoryview
@@ -25,9 +27,6 @@
 # Serialization Functions
 #-----------------------------------------------------------------------------
 
-# default values for the thresholds:
-MAX_ITEMS = 64
-MAX_BYTES = 1024
 
 def _extract_buffers(obj, threshold=MAX_BYTES):
     """extract buffers larger than a certain threshold"""
diff --git a/jupyter_client/session.py b/jupyter_client/session.py
@@ -53,7 +53,6 @@ def compare_digest(a,b): return a == b
                                         TraitError,
 )
 from IPython.utils.pickleutil import PICKLE_PROTOCOL
-from IPython.kernel.zmq.serialize import MAX_ITEMS, MAX_BYTES
 from jupyter_client.adapter import adapt
 
 #-----------------------------------------------------------------------------
@@ -78,6 +77,10 @@ def squash_unicode(obj):
 # globals and defaults
 #-----------------------------------------------------------------------------
 
+# default values for the thresholds:
+MAX_ITEMS = 64
+MAX_BYTES = 1024
+
 # ISO8601-ify datetime objects
 # allow unicode
 # disallow nan, because it's not actually valid JSON
