diff --git a/IPython/zmq/__init__.py b/IPython/zmq/__init__.py index 32bd7f4..0063d45 100644 --- a/IPython/zmq/__init__.py +++ b/IPython/zmq/__init__.py @@ -6,10 +6,10 @@ #----------------------------------------------------------------------------- #----------------------------------------------------------------------------- -# Verify zmq version dependency >= 2.0.10.1 +# Verify zmq version dependency >= 2.0.10-1 #----------------------------------------------------------------------------- -minimum_pyzmq_version = "2.0.10.1" +minimum_pyzmq_version = "2.0.10-1" try: import zmq diff --git a/IPython/zmq/ipkernel.py b/IPython/zmq/ipkernel.py index 8a77e0c..a9f38cf 100755 --- a/IPython/zmq/ipkernel.py +++ b/IPython/zmq/ipkernel.py @@ -44,6 +44,21 @@ from zmqshell import ZMQInteractiveShell # Module-level logger logger = logging.getLogger(__name__) +# FIXME: this needs to be done more cleanly later, once we have proper +# configuration support. This is a library, so it shouldn't set a stream +# handler, see: +# http://docs.python.org/library/logging.html#configuring-logging-for-a-library +# But this lets us at least do developer debugging for now by manually turning +# it on/off. And once we have full config support, the client entry points +# will select their logging handlers, as well as passing to this library the +# logging level. + +if 0: # dbg - set to 1 to actually see the messages. + logger.addHandler(logging.StreamHandler()) + logger.setLevel(logging.DEBUG) + +# /FIXME + #----------------------------------------------------------------------------- # Main kernel class #-----------------------------------------------------------------------------