From 2353c578da34d712b95d25e5065fc5e2614ec46c 2008-08-23 23:45:42 From: Brian Granger Date: 2008-08-23 23:45:42 Subject: [PATCH] Fixing minor bugs in tests. --- diff --git a/IPython/frontend/asyncfrontendbase.py b/IPython/frontend/asyncfrontendbase.py index 0efa11b..a35366f 100644 --- a/IPython/frontend/asyncfrontendbase.py +++ b/IPython/frontend/asyncfrontendbase.py @@ -16,28 +16,12 @@ __docformat__ = "restructuredtext en" #------------------------------------------------------------------------------- import uuid -try: - from zope.interface import Interface, Attribute, implements, classProvides -except ImportError, e: - e.message = """%s -________________________________________________________________________________ -zope.interface is required to run asynchronous frontends.""" % e.message - e.args = (e.message, ) + e.args[1:] - -from frontendbase import FrontEndBase, IFrontEnd, IFrontEndFactory +from zope.interface import Interface, Attribute, implements, classProvides +from twisted.python.failure import Failure +from IPython.frontend.frontendbase import FrontEndBase, IFrontEnd, IFrontEndFactory from IPython.kernel.core.history import FrontEndHistory - -try: - from IPython.kernel.engineservice import IEngineCore - from twisted.python.failure import Failure -except ImportError, e: - e.message = """%s -________________________________________________________________________________ -twisted is required to run asynchronous frontends.""" % e.message - e.args = (e.message, ) + e.args[1:] - - +from IPython.kernel.engineservice import IEngineCore class AsyncFrontEndBase(FrontEndBase): diff --git a/IPython/frontend/frontendbase.py b/IPython/frontend/frontendbase.py index a1ece4f..9f98dcf 100644 --- a/IPython/frontend/frontendbase.py +++ b/IPython/frontend/frontendbase.py @@ -24,8 +24,12 @@ import string import uuid import _ast -from zopeinterface import Interface, Attribute, implements, classProvides - +from IPython.frontend.zopeinterface import ( + Interface, + Attribute, + implements, + classProvides +) from IPython.kernel.core.history import FrontEndHistory from IPython.kernel.core.util import Bunch diff --git a/docs/source/development/development.txt b/docs/source/development/development.txt index d296fcb..e4bc727 100644 --- a/docs/source/development/development.txt +++ b/docs/source/development/development.txt @@ -358,24 +358,14 @@ Installation scenarios ---------------------- 1. Install from tarball using `python setup.py install`. - a. With only readline+nose dependencies installed (test1) - - virtualenv --no-site-packages test1 - # Activate it - easy_install nose - easy_install readline # On OS X or pyreadline on win32 - cd ipython-0.9.beta3 - python setup.py install - + a. With only readline+nose dependencies installed. b. With all dependencies installed (readline, zope.interface, - Twisted, foolscap, Sphinx, nose, pyOpenSSL) (test2) + Twisted, foolscap, Sphinx, nose, pyOpenSSL). 2. Install using easy_install. - a. With only readline+nose dependencies installed (test3) - i. Default dependencies. - ii. Optional dependency sets (kernel, doc, test, security) - easy_install -f ipython-0.9.beta3-py2.5.egg IPython[kernel,doc,test,security] - - b. With all dependencies already installed (test2) + a. With only readline+nose dependencies installed. + i. Default dependencies: `easy_install ipython-0.9.beta3-py2.5.egg` + ii. Optional dependency sets: `easy_install -f ipython-0.9.beta3-py2.5.egg IPython[kernel,doc,test,security]` + b. With all dependencies already installed. Tests to run for these scenarios