From 1f3ce460d2dd934828b0db85a116ec753d6a888b 2008-08-23 22:34:55
From: Brian Granger <ellisonbg@gmail.com>
Date: 2008-08-23 22:34:55
Subject: [PATCH] Changed a bunch of modules to NOT have the x permission bit set.

---

diff --git a/IPython/Extensions/ipy_pydb.py b/IPython/Extensions/ipy_pydb.py
old mode 100755
new mode 100644
diff --git a/IPython/Extensions/ipy_stock_completers.py b/IPython/Extensions/ipy_stock_completers.py
old mode 100755
new mode 100644
diff --git a/IPython/Extensions/jobctrl.py b/IPython/Extensions/jobctrl.py
old mode 100755
new mode 100644
diff --git a/IPython/Extensions/ledit.py b/IPython/Extensions/ledit.py
old mode 100755
new mode 100644
diff --git a/IPython/PyColorize.py b/IPython/PyColorize.py
old mode 100755
new mode 100644
diff --git a/IPython/frontend/cocoa/tests/test_cocoa_frontend.py b/IPython/frontend/cocoa/tests/test_cocoa_frontend.py
index 8ba73b2..e12f85a 100644
--- a/IPython/frontend/cocoa/tests/test_cocoa_frontend.py
+++ b/IPython/frontend/cocoa/tests/test_cocoa_frontend.py
@@ -14,16 +14,18 @@ __docformat__ = "restructuredtext en"
 #---------------------------------------------------------------------------
 # Imports                                                                   
 #---------------------------------------------------------------------------
-from IPython.kernel.core.interpreter import Interpreter                     
-import IPython.kernel.engineservice as es
-from IPython.testing.util import DeferredTestCase
-from twisted.internet.defer import succeed
 
 try:
+	from IPython.kernel.core.interpreter import Interpreter                     
+	import IPython.kernel.engineservice as es
+	from IPython.testing.util import DeferredTestCase
+	from twisted.internet.defer import succeed
 	from IPython.frontend.cocoa.cocoa_frontend import IPythonCocoaController                                                    
 	from Foundation import NSMakeRect
 	from AppKit import NSTextView, NSScrollView                                                
 except ImportError:
+	pass
+else:
 	class TestIPythonCocoaControler(DeferredTestCase):
 	    """Tests for IPythonCocoaController"""
     
diff --git a/IPython/frontend/frontendbase.py b/IPython/frontend/frontendbase.py
index 7012ba8..a1ece4f 100644
--- a/IPython/frontend/frontendbase.py
+++ b/IPython/frontend/frontendbase.py
@@ -28,7 +28,6 @@ from zopeinterface import Interface, Attribute, implements, classProvides
 
 from IPython.kernel.core.history import FrontEndHistory
 from IPython.kernel.core.util import Bunch
-from IPython.kernel.engineservice import IEngineCore
 
 ##############################################################################
 # TEMPORARY!!! fake configuration, while we decide whether to use tconfig or
diff --git a/IPython/frontend/tests/test_frontendbase.py b/IPython/frontend/tests/test_frontendbase.py
index 42d3856..1c4e283 100644
--- a/IPython/frontend/tests/test_frontendbase.py
+++ b/IPython/frontend/tests/test_frontendbase.py
@@ -16,9 +16,14 @@ __docformat__ = "restructuredtext en"
 #---------------------------------------------------------------------------
 
 import unittest
-from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
-from IPython.frontend import frontendbase 
-from IPython.kernel.engineservice import EngineService
+
+try:
+	from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
+	from IPython.frontend import frontendbase 
+	from IPython.kernel.engineservice import EngineService
+except ImportError:
+	import nose
+	raise nose.SkipTest("This test requires zope.interface and Twisted")
 
 class FrontEndCallbackChecker(AsyncFrontEndBase):
     """FrontEndBase subclass for checking callbacks"""
@@ -28,11 +33,11 @@ class FrontEndCallbackChecker(AsyncFrontEndBase):
         self.updateCalled = False
         self.renderResultCalled = False
         self.renderErrorCalled = False
-    
+   
     def update_cell_prompt(self, result, blockID=None):
         self.updateCalled = True
         return result
-    
+   
     def render_result(self, result):
         self.renderResultCalled = True
         return result
diff --git a/IPython/gui/wx/wxIPython.py b/IPython/gui/wx/wxIPython.py
old mode 100755
new mode 100644
diff --git a/IPython/irunner.py b/IPython/irunner.py
old mode 100755
new mode 100644
diff --git a/IPython/kernel/scripts/ipcluster.py b/IPython/kernel/scripts/ipcluster.py
old mode 100755
new mode 100644
diff --git a/IPython/kernel/scripts/ipcontroller.py b/IPython/kernel/scripts/ipcontroller.py
old mode 100755
new mode 100644
diff --git a/IPython/kernel/scripts/ipengine.py b/IPython/kernel/scripts/ipengine.py
old mode 100755
new mode 100644
diff --git a/IPython/kernel/tests/test_enginefc.py b/IPython/kernel/tests/test_enginefc.py
index 7f482cf..c099d9a 100644
--- a/IPython/kernel/tests/test_enginefc.py
+++ b/IPython/kernel/tests/test_enginefc.py
@@ -37,8 +37,7 @@ try:
         IEngineSerializedTestCase, \
         IEngineQueuedTestCase
 except ImportError:
-    print "we got an error!!!"
-    raise
+	pass
 else:
     class EngineFCTest(DeferredTestCase, 
                        IEngineCoreTestCase, 
diff --git a/IPython/testing/mkdoctests.py b/IPython/testing/mkdoctests.py
old mode 100755
new mode 100644