1
=== modified file 'IPython/frontend/tests/test_asyncfrontendbase.py'
2
--- IPython/frontend/tests/test_asyncfrontendbase.py	2008-09-14 22:13:51 +0000
3
+++ IPython/frontend/tests/test_asyncfrontendbase.py	2009-04-16 05:08:03 +0000
4
@@ -1,6 +1,6 @@
5
1
# encoding: utf-8
1
# encoding: utf-8
6
2
2
8
3
"""This file contains unittests for the frontendbase module."""
3
"""This file contains unittests for the asyncfrontendbase module."""
9
4
4
10
5
__docformat__ = "restructuredtext en"
5
__docformat__ = "restructuredtext en"
11
6
6
12
@@ -15,17 +15,17 @@
13
15
# Imports                                                                   
15
# Imports                                                                   
14
16
#---------------------------------------------------------------------------
16
#---------------------------------------------------------------------------
15
17
17
16
18
import unittest
17
19
18
18
20
try:
19
try:
19
20
    from twisted.trial import unittest
20
21
    from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
21
    from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
21
22
    from IPython.frontend import frontendbase 
22
    from IPython.frontend import frontendbase 
22
23
    from IPython.kernel.engineservice import EngineService
23
    from IPython.kernel.engineservice import EngineService
23
24
    from IPython.testing.parametric import Parametric, parametric
24
24
except ImportError:
25
except ImportError:
25
25
    import nose
26
    import nose
26
26
    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
27
    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
27
27
28
28
28
from IPython.testing.decorators import skip
29
29
29
30
30
class FrontEndCallbackChecker(AsyncFrontEndBase):
30
class FrontEndCallbackChecker(AsyncFrontEndBase):
31
31
    """FrontEndBase subclass for checking callbacks"""
31
    """FrontEndBase subclass for checking callbacks"""
32
@@ -44,14 +44,11 @@
33
44
        self.renderResultCalled = True
44
        self.renderResultCalled = True
34
45
        return result
45
        return result
35
46
    
46
    
36
47
    
37
48
    def render_error(self, failure):
47
    def render_error(self, failure):
38
49
        self.renderErrorCalled = True
48
        self.renderErrorCalled = True
39
50
        return failure
49
        return failure
44
51
    
50
45
52
51
42
53
43
54
    
46
55
class TestAsyncFrontendBase(unittest.TestCase):
52
class TestAsyncFrontendBase(unittest.TestCase):
47
56
    def setUp(self):
53
    def setUp(self):
48
57
        """Setup the EngineService and FrontEndBase"""
54
        """Setup the EngineService and FrontEndBase"""
49
@@ -59,97 +56,56 @@
50
59
        self.fb = FrontEndCallbackChecker(engine=EngineService())
56
        self.fb = FrontEndCallbackChecker(engine=EngineService())
51
60
    
57
    
52
61
    def test_implements_IFrontEnd(self):
58
    def test_implements_IFrontEnd(self):
54
62
        assert(frontendbase.IFrontEnd.implementedBy(
59
        self.assert_(frontendbase.IFrontEnd.implementedBy(
55
63
                                    AsyncFrontEndBase))
60
                                    AsyncFrontEndBase))
56
64
    
61
    
57
65
    def test_is_complete_returns_False_for_incomplete_block(self):
62
    def test_is_complete_returns_False_for_incomplete_block(self):
58
66
        """"""
59
67
        
60
68
        block = """def test(a):"""
63
        block = """def test(a):"""
63
69
        
64
        self.assert_(self.fb.is_complete(block) == False)
62
70
        assert(self.fb.is_complete(block) == False)
64
71
    
65
    
65
72
    def test_is_complete_returns_True_for_complete_block(self):
66
    def test_is_complete_returns_True_for_complete_block(self):
66
73
        """"""
67
74
        
68
75
        block = """def test(a): pass"""
67
        block = """def test(a): pass"""
72
76
            
68
        self.assert_(self.fb.is_complete(block))
70
77
        assert(self.fb.is_complete(block))
71
78
        
73
79
        block = """a=3"""
69
        block = """a=3"""
76
80
        
70
        self.assert_(self.fb.is_complete(block))
75
81
        assert(self.fb.is_complete(block))
77
82
    
71
    
78
83
    def test_blockID_added_to_result(self):
72
    def test_blockID_added_to_result(self):
79
84
        block = """3+3"""
73
        block = """3+3"""
80
85
        
81
86
        d = self.fb.execute(block, blockID='TEST_ID')
74
        d = self.fb.execute(block, blockID='TEST_ID')
84
87
        
75
        d.addCallback(lambda r: self.assert_(r['blockID']=='TEST_ID'))
85
88
        d.addCallback(self.checkBlockID, expected='TEST_ID')
76
        return d
86
89
    
77
    
87
90
    def test_blockID_added_to_failure(self):
78
    def test_blockID_added_to_failure(self):
88
91
        block = "raise Exception()"
79
        block = "raise Exception()"
89
92
        
90
93
        d = self.fb.execute(block,blockID='TEST_ID')
80
        d = self.fb.execute(block,blockID='TEST_ID')
100
94
        d.addErrback(self.checkFailureID, expected='TEST_ID')
81
        d.addErrback(lambda f: self.assert_(f.blockID=='TEST_ID'))
101
95
    
82
        return d
93
96
    def checkBlockID(self, result, expected=""):
94
97
        assert(result['blockID'] == expected)
95
98
    
96
99
    
97
100
    def checkFailureID(self, failure, expected=""):
98
101
        assert(failure.blockID == expected)
99
102
    
102
103
    
83
    
103
104
    def test_callbacks_added_to_execute(self):
84
    def test_callbacks_added_to_execute(self):
104
105
        """test that
105
106
        update_cell_prompt
106
107
        render_result
107
108
        
108
109
        are added to execute request
109
110
        """
110
111
        
111
112
        d = self.fb.execute("10+10")
85
        d = self.fb.execute("10+10")
119
113
        d.addCallback(self.checkCallbacks)
86
        d.addCallback(lambda r: self.assert_(self.fb.updateCalled and self.fb.renderResultCalled))
120
114
    
87
        return d
121
115
    def checkCallbacks(self, result):
88
    
115
116
        assert(self.fb.updateCalled)
116
117
        assert(self.fb.renderResultCalled)
117
118
    
118
119
    @skip("This test fails and lead to an unhandled error in a Deferred.")
122
120
    def test_error_callback_added_to_execute(self):
89
    def test_error_callback_added_to_execute(self):
124
121
        """test that render_error called on execution error"""
90
        """Test that render_error called on execution error."""
125
122
        
91
        
126
123
        d = self.fb.execute("raise Exception()")
92
        d = self.fb.execute("raise Exception()")
131
124
        d.addCallback(self.checkRenderError)
93
        d.addErrback(lambda f: self.assert_(self.fb.renderErrorCalled))
132
125
    
94
        return d
129
126
    def checkRenderError(self, result):
130
127
        assert(self.fb.renderErrorCalled)
133
128
    
95
    
134
129
    def test_history_returns_expected_block(self):
96
    def test_history_returns_expected_block(self):
136
130
        """Make sure history browsing doesn't fail"""
97
        """Make sure history browsing doesn't fail."""
137
131
        
98
        
138
132
        blocks = ["a=1","a=2","a=3"]
99
        blocks = ["a=1","a=2","a=3"]
162
133
        for b in blocks:
100
        d = self.fb.execute(blocks[0])
163
134
            d = self.fb.execute(b)
101
        d.addCallback(lambda _: self.fb.execute(blocks[1]))
164
135
        
102
        d.addCallback(lambda _: self.fb.execute(blocks[2]))
165
136
        # d is now the deferred for the last executed block
103
        d.addCallback(lambda _: self.assert_(self.fb.get_history_previous("")==blocks[-2]))
166
137
        d.addCallback(self.historyTests, blocks)
104
        d.addCallback(lambda _: self.assert_(self.fb.get_history_previous("")==blocks[-3]))
167
138
        
105
        d.addCallback(lambda _: self.assert_(self.fb.get_history_next()==blocks[-2]))
168
139
    
106
        return d
169
140
    def historyTests(self, result, blocks):
107
    
170
141
        """historyTests"""
108
    def test_history_returns_none_at_startup(self):        
171
142
        
109
        self.assert_(self.fb.get_history_previous("")==None)
172
143
        assert(len(blocks) >= 3)
110
        self.assert_(self.fb.get_history_next()==None)
173
144
        assert(self.fb.get_history_previous("") == blocks[-2])
111
151
145
        assert(self.fb.get_history_previous("") == blocks[-3])
152
146
        assert(self.fb.get_history_next() == blocks[-2])
153
147
    
154
148
    
155
149
    def test_history_returns_none_at_startup(self):
156
150
        """test_history_returns_none_at_startup"""
157
151
        
158
152
        assert(self.fb.get_history_previous("")==None)
159
153
        assert(self.fb.get_history_next()==None)
160
154
    
161
155
    
174
156
112
175
=== modified file 'IPython/genutils.py'
176
--- IPython/genutils.py	2009-03-16 23:58:42 +0000
177
+++ IPython/genutils.py	2009-04-18 23:24:22 +0000
178
@@ -1007,7 +1007,17 @@
179
1007
    else:
1007
    else:
180
1008
        os.chmod(security_dir, 0700)
1008
        os.chmod(security_dir, 0700)
181
1009
    return security_dir
1009
    return security_dir
183
1010
        
1010
184
1011
def get_log_dir():
185
1012
    """Get the IPython log directory.
186
1013
    
187
1014
    If the log directory does not exist, it is created.
188
1015
    """
189
1016
    log_dir = os.path.join(get_ipython_dir(), 'log')
190
1017
    if not os.path.isdir(log_dir):
191
1018
        os.mkdir(log_dir, 0777)
192
1019
    return log_dir
193
1020
194
1011
#****************************************************************************
1021
#****************************************************************************
195
1012
# strings and text
1022
# strings and text
196
1013
1023
197
1014
1024
198
=== modified file 'IPython/kernel/__init__.py'
199
--- IPython/kernel/__init__.py	2008-06-08 22:25:02 +0000
200
+++ IPython/kernel/__init__.py	2009-04-18 23:24:22 +0000
201
@@ -15,10 +15,9 @@
202
15
deferred/Twisted using clients.
15
deferred/Twisted using clients.
203
16
"""
16
"""
204
17
__docformat__ = "restructuredtext en"
17
__docformat__ = "restructuredtext en"
206
18
#-------------------------------------------------------------------------------
18
#-----------------------------------------------------------------------------
207
19
#  Copyright (C) 2008  The IPython Development Team
19
#  Copyright (C) 2008  The IPython Development Team
208
20
#
20
#
209
21
#  Distributed under the terms of the BSD License.  The full license is in
21
#  Distributed under the terms of the BSD License.  The full license is in
210
22
#  the file COPYING, distributed as part of this software.
22
#  the file COPYING, distributed as part of this software.
211
23
#-------------------------------------------------------------------------------
212
24
    
213
25
\ No newline at end of file
23
\ No newline at end of file
214
24
#-----------------------------------------------------------------------------
215
26
\ No newline at end of file
25
\ No newline at end of file
216
27
26
217
=== modified file 'IPython/kernel/config/__init__.py'
218
--- IPython/kernel/config/__init__.py	2008-11-14 23:27:13 +0000
219
+++ IPython/kernel/config/__init__.py	2009-04-18 23:24:22 +0000
220
@@ -15,6 +15,7 @@
221
15
# Imports
15
# Imports
222
16
#-------------------------------------------------------------------------------
16
#-------------------------------------------------------------------------------
223
17
17
224
18
import os, sys
225
18
from os.path import join as pjoin
19
from os.path import join as pjoin
226
19
20
227
20
from IPython.external.configobj import ConfigObj
21
from IPython.external.configobj import ConfigObj
228
@@ -23,6 +24,7 @@
229
23
24
230
24
default_kernel_config = ConfigObj()
25
default_kernel_config = ConfigObj()
231
25
26
232
27
# This will raise OSError if ipythondir doesn't exist.
233
26
security_dir = get_security_dir()
28
security_dir = get_security_dir()
234
27
29
235
28
#-------------------------------------------------------------------------------
30
#-------------------------------------------------------------------------------
236
29
31
237
=== modified file 'IPython/kernel/core/interpreter.py'
238
--- IPython/kernel/core/interpreter.py	2008-09-06 02:26:28 +0000
239
+++ IPython/kernel/core/interpreter.py	2009-04-19 00:13:57 +0000
240
@@ -679,21 +679,22 @@
241
679
        # to exec will fail however.  There seems to be some inconsistency in
679
        # to exec will fail however.  There seems to be some inconsistency in
242
680
        # how trailing whitespace is handled, but this seems to work.
680
        # how trailing whitespace is handled, but this seems to work.
243
681
        python = python.strip()
681
        python = python.strip()
245
682
682
        
246
683
        # The compiler module does not like unicode. We need to convert
683
        # The compiler module does not like unicode. We need to convert
247
684
        # it encode it:
684
        # it encode it:
248
685
        if isinstance(python, unicode):
685
        if isinstance(python, unicode):
249
686
            # Use the utf-8-sig BOM so the compiler detects this a UTF-8
686
            # Use the utf-8-sig BOM so the compiler detects this a UTF-8
250
687
            # encode string.
687
            # encode string.
251
688
            python = '\xef\xbb\xbf' + python.encode('utf-8')
688
            python = '\xef\xbb\xbf' + python.encode('utf-8')
253
689
689
        
254
690
        # The compiler module will parse the code into an abstract syntax tree.
690
        # The compiler module will parse the code into an abstract syntax tree.
255
691
        # This has a bug with str("a\nb"), but not str("""a\nb""")!!!
256
691
        ast = compiler.parse(python)
692
        ast = compiler.parse(python)
258
692
693
        
259
693
        # Uncomment to help debug the ast tree
694
        # Uncomment to help debug the ast tree
260
694
        # for n in ast.node:
695
        # for n in ast.node:
261
695
        #     print n.lineno,'->',n
696
        #     print n.lineno,'->',n
263
696
                
697
        
264
697
        # Each separate command is available by iterating over ast.node. The
698
        # Each separate command is available by iterating over ast.node. The
265
698
        # lineno attribute is the line number (1-indexed) beginning the commands
699
        # lineno attribute is the line number (1-indexed) beginning the commands
266
699
        # suite.
700
        # suite.
267
@@ -703,20 +704,23 @@
268
703
        # We might eventually discover other cases where lineno is None and have
704
        # We might eventually discover other cases where lineno is None and have
269
704
        # to put in a more sophisticated test.
705
        # to put in a more sophisticated test.
270
705
        linenos = [x.lineno-1 for x in ast.node if x.lineno is not None]
706
        linenos = [x.lineno-1 for x in ast.node if x.lineno is not None]
272
706
707
        
273
707
        # When we finally get the slices, we will need to slice all the way to
708
        # When we finally get the slices, we will need to slice all the way to
274
708
        # the end even though we don't have a line number for it. Fortunately,
709
        # the end even though we don't have a line number for it. Fortunately,
275
709
        # None does the job nicely.
710
        # None does the job nicely.
276
710
        linenos.append(None)
711
        linenos.append(None)
277
712
        
278
713
        # This is causing problems with commands that have a \n embedded in
279
714
        # a string, such as str("""a\nb""")
280
711
        lines = python.splitlines()
715
        lines = python.splitlines()
282
712
716
        
283
713
        # Create a list of atomic commands.
717
        # Create a list of atomic commands.
284
714
        cmds = []
718
        cmds = []
285
715
        for i, j in zip(linenos[:-1], linenos[1:]):
719
        for i, j in zip(linenos[:-1], linenos[1:]):
286
716
            cmd = lines[i:j]
720
            cmd = lines[i:j]
287
717
            if cmd:
721
            if cmd:
288
718
                cmds.append('\n'.join(cmd)+'\n')
722
                cmds.append('\n'.join(cmd)+'\n')
290
719
723
        
291
720
        return cmds
724
        return cmds
292
721
725
293
722
    def error(self, text):
726
    def error(self, text):
294
723
727
295
=== modified file 'IPython/kernel/core/tests/test_interpreter.py'
296
--- IPython/kernel/core/tests/test_interpreter.py	2008-09-06 03:26:50 +0000
297
+++ IPython/kernel/core/tests/test_interpreter.py	2009-04-19 00:13:57 +0000
298
@@ -15,12 +15,22 @@
299
15
# Imports                                                                     
15
# Imports                                                                     
300
16
#-----------------------------------------------------------------------------
16
#-----------------------------------------------------------------------------
301
17
17
302
18
import unittest
303
18
from IPython.kernel.core.interpreter import Interpreter
19
from IPython.kernel.core.interpreter import Interpreter
304
19
20
311
20
def test_unicode():
21
class TestInterpreter(unittest.TestCase):
312
21
    """ Test unicode handling with the interpreter.
22
    
313
22
    """
23
    def test_unicode(self):
314
23
    i = Interpreter()
24
        """ Test unicode handling with the interpreter.
315
24
    i.execute_python(u'print "ù"')
25
        """
316
25
    i.execute_python('print "ù"')
26
        i = Interpreter()
317
27
        i.execute_python(u'print "ù"')
318
28
        i.execute_python('print "ù"')
319
29
    
320
30
    def test_ticket266993_1(self):
321
31
        i = Interpreter()
322
32
        i.execute('str("""a\nb""")')
323
26
33
324
34
    def test_ticket266993_2(self):
325
35
        i = Interpreter()
326
36
        i.execute('str("a\nb")')
327
27
\ No newline at end of file
37
\ No newline at end of file
328
28
38
329
=== modified file 'IPython/kernel/core/ultraTB.py'
330
--- IPython/kernel/core/ultraTB.py	2009-03-11 06:53:19 +0000
331
+++ IPython/kernel/core/ultraTB.py	2009-04-16 05:22:09 +0000
332
@@ -487,10 +487,14 @@
333
487
            else:
487
            else:
334
488
                list.append('%s\n' % str(stype))
488
                list.append('%s\n' % str(stype))
335
489
489
340
490
        # vds:>>
490
        # This is being commented out for now as the __IPYTHON__ variable
341
491
        if have_filedata:
491
        # referenced here is not resolved and causes massive test failures
342
492
            __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0)
492
        # and errors. B. Granger, 04/2009.
343
493
        # vds:<<
493
        # See https://bugs.launchpad.net/bugs/362137
344
494
        # # vds:>>
345
495
        # if have_filedata:
346
496
        #     __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0)
347
497
        # # vds:<<
348
494
498
349
495
        return list
499
        return list
350
496
500
351
@@ -804,13 +808,17 @@
352
804
                value = text_repr(getattr(evalue, name))
808
                value = text_repr(getattr(evalue, name))
353
805
                exception.append('\n%s%s = %s' % (indent, name, value))
809
                exception.append('\n%s%s = %s' % (indent, name, value))
354
806
810
362
807
        # vds: >>
811
        # This is being commented out for now as the __IPYTHON__ variable
363
808
        if records:
812
        # referenced here is not resolved and causes massive test failures
364
809
             filepath, lnum = records[-1][1:3]
813
        # and errors. B. Granger, 04/2009.
365
810
             #print "file:", str(file), "linenb", str(lnum) # dbg
814
        # See https://bugs.launchpad.net/bugs/362137
366
811
             filepath = os.path.abspath(filepath)
815
        # # vds: >>
367
812
             __IPYTHON__.hooks.synchronize_with_editor(filepath, lnum, 0)
816
        # if records:
368
813
        # vds: <<
817
        #      filepath, lnum = records[-1][1:3]
369
818
        #      #print "file:", str(file), "linenb", str(lnum) # dbg
370
819
        #      filepath = os.path.abspath(filepath)
371
820
        #      __IPYTHON__.hooks.synchronize_with_editor(filepath, lnum, 0)
372
821
        # # vds: <<
373
814
                
822
                
374
815
        # return all our info assembled as a single string
823
        # return all our info assembled as a single string
375
816
        return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) )
824
        return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) )
376
817
825
377
=== modified file 'IPython/kernel/engineconnector.py'
378
--- IPython/kernel/engineconnector.py	2008-11-14 23:27:13 +0000
379
+++ IPython/kernel/engineconnector.py	2009-04-18 21:53:37 +0000
380
@@ -67,10 +67,10 @@
381
67
            self.furl = find_furl(furl_or_file)
67
            self.furl = find_furl(furl_or_file)
382
68
        except ValueError:
68
        except ValueError:
383
69
            return defer.fail(failure.Failure())
69
            return defer.fail(failure.Failure())
388
70
            # return defer.fail(failure.Failure(ValueError('not a valid furl or furl file: %r' % furl_or_file)))
70
        else:
389
71
        d = self.tub.getReference(self.furl)
71
            d = self.tub.getReference(self.furl)
390
72
        d.addCallbacks(self._register, self._log_failure)
72
            d.addCallbacks(self._register, self._log_failure)
391
73
        return d
73
            return d
392
74
    
74
    
393
75
    def _log_failure(self, reason):
75
    def _log_failure(self, reason):
394
76
        log.err('EngineConnector: engine registration failed:')
76
        log.err('EngineConnector: engine registration failed:')
395
77
77
396
=== modified file 'IPython/kernel/error.py'
397
--- IPython/kernel/error.py	2008-06-06 19:41:55 +0000
398
+++ IPython/kernel/error.py	2009-04-18 21:53:37 +0000
399
@@ -104,6 +104,9 @@
400
104
class SecurityError(KernelError):
104
class SecurityError(KernelError):
401
105
    pass
105
    pass
402
106
106
403
107
class FileTimeoutError(KernelError):
404
108
    pass
405
109
406
107
class CompositeError(KernelError):
110
class CompositeError(KernelError):
407
108
    def __init__(self, message, elist):
111
    def __init__(self, message, elist):
408
109
        Exception.__init__(self, *(message, elist))
112
        Exception.__init__(self, *(message, elist))
409
110
113
410
=== modified file 'IPython/kernel/scripts/ipcluster.py'
411
--- IPython/kernel/scripts/ipcluster.py	2009-03-23 15:54:00 +0000
412
+++ IPython/kernel/scripts/ipcluster.py	2009-04-18 23:24:22 +0000
413
@@ -1,4 +1,4 @@
415
1
#!/usr/bin/env python
1
 #!/usr/bin/env python
416
2
# encoding: utf-8
2
# encoding: utf-8
417
3
3
418
4
"""Start an IPython cluster = (controller + engines)."""
4
"""Start an IPython cluster = (controller + engines)."""
419
@@ -29,11 +29,25 @@
420
29
29
421
30
from IPython.external import argparse
30
from IPython.external import argparse
422
31
from IPython.external import Itpl
31
from IPython.external import Itpl
428
32
from IPython.genutils import get_ipython_dir, num_cpus
32
from IPython.genutils import get_ipython_dir, get_log_dir, get_security_dir
429
33
from IPython.kernel.fcutil import have_crypto
33
from IPython.genutils import num_cpus
430
34
from IPython.kernel.error import SecurityError
34
from IPython.kernel.fcutil import have_crypto
431
35
from IPython.kernel.fcutil import have_crypto
35
432
36
from IPython.kernel.twistedutil import gatherBoth
36
# Create various ipython directories if they don't exist.
433
37
# This must be done before IPython.kernel.config is imported.
434
38
from IPython.iplib import user_setup
435
39
if os.name == 'posix':
436
40
    rc_suffix = ''
437
41
else:
438
42
    rc_suffix = '.ini'
439
43
user_setup(get_ipython_dir(), rc_suffix, mode='install', interactive=False)
440
44
get_log_dir()
441
45
get_security_dir()
442
46
443
47
from IPython.kernel.config import config_manager as kernel_config_manager
444
48
from IPython.kernel.error import SecurityError, FileTimeoutError
445
49
from IPython.kernel.fcutil import have_crypto
446
50
from IPython.kernel.twistedutil import gatherBoth, wait_for_file
447
37
from IPython.kernel.util import printer
51
from IPython.kernel.util import printer
448
38
52
449
39
53
450
@@ -184,8 +198,10 @@
451
184
            from IPython.kernel.scripts import ipcontroller
198
            from IPython.kernel.scripts import ipcontroller
452
185
            script_location = ipcontroller.__file__.replace('.pyc', '.py')
199
            script_location = ipcontroller.__file__.replace('.pyc', '.py')
453
186
            # The -u option here turns on unbuffered output, which is required
200
            # The -u option here turns on unbuffered output, which is required
456
187
            # on Win32 to prevent wierd conflict and problems with Twisted
201
            # on Win32 to prevent wierd conflict and problems with Twisted.
457
188
            args = [find_exe('python'), '-u', script_location]
202
            # Also, use sys.executable to make sure we are picking up the 
458
203
            # right python exe.
459
204
            args = [sys.executable, '-u', script_location]
460
189
        else:
205
        else:
461
190
            args = ['ipcontroller']
206
            args = ['ipcontroller']
462
191
        self.extra_args = extra_args
207
        self.extra_args = extra_args
463
@@ -204,8 +220,10 @@
464
204
            from IPython.kernel.scripts import ipengine
220
            from IPython.kernel.scripts import ipengine
465
205
            script_location = ipengine.__file__.replace('.pyc', '.py')
221
            script_location = ipengine.__file__.replace('.pyc', '.py')
466
206
            # The -u option here turns on unbuffered output, which is required
222
            # The -u option here turns on unbuffered output, which is required
469
207
            # on Win32 to prevent wierd conflict and problems with Twisted
223
            # on Win32 to prevent wierd conflict and problems with Twisted.
470
208
            args = [find_exe('python'), '-u', script_location]
224
            # Also, use sys.executable to make sure we are picking up the 
471
225
            # right python exe.
472
226
            args = [sys.executable, '-u', script_location]
473
209
        else:
227
        else:
474
210
            args = ['ipengine']
228
            args = ['ipengine']
475
211
        self.extra_args = extra_args
229
        self.extra_args = extra_args
476
@@ -465,6 +483,7 @@
477
465
# The main functions should then just parse the command line arguments, create
483
# The main functions should then just parse the command line arguments, create
478
466
# the appropriate class and call a 'start' method.
484
# the appropriate class and call a 'start' method.
479
467
485
480
486
481
468
def check_security(args, cont_args):
487
def check_security(args, cont_args):
482
469
    if (not args.x or not args.y) and not have_crypto:
488
    if (not args.x or not args.y) and not have_crypto:
483
470
        log.err("""
489
        log.err("""
484
@@ -478,6 +497,7 @@
485
478
        cont_args.append('-y')
497
        cont_args.append('-y')
486
479
    return True
498
    return True
487
480
499
488
500
489
481
def check_reuse(args, cont_args):
501
def check_reuse(args, cont_args):
490
482
    if args.r:
502
    if args.r:
491
483
        cont_args.append('-r')
503
        cont_args.append('-r')
492
@@ -491,6 +511,23 @@
493
491
        cont_args.append('--engine-port=%i' % args.engine_port)
511
        cont_args.append('--engine-port=%i' % args.engine_port)
494
492
    return True
512
    return True
495
493
513
496
514
497
515
def _err_and_stop(f):
498
516
    log.err(f)
499
517
    reactor.stop()
500
518
501
519
502
520
def _delay_start(cont_pid, start_engines, furl_file, reuse):
503
521
    if not reuse:
504
522
        if os.path.isfile(furl_file):
505
523
            os.unlink(furl_file)
506
524
    log.msg('Waiting for controller to finish starting...')
507
525
    d = wait_for_file(furl_file, delay=0.2, max_tries=50)
508
526
    d.addCallback(lambda _: log.msg('Controller started'))
509
527
    d.addCallback(lambda _: start_engines(cont_pid))
510
528
    return d
511
529
512
530
513
494
def main_local(args):
531
def main_local(args):
514
495
    cont_args = []
532
    cont_args = []
515
496
    cont_args.append('--logfile=%s' % pjoin(args.logdir,'ipcontroller'))
533
    cont_args.append('--logfile=%s' % pjoin(args.logdir,'ipcontroller'))
516
@@ -520,13 +557,10 @@
517
520
        signal.signal(signal.SIGINT,shutdown)
557
        signal.signal(signal.SIGINT,shutdown)
518
521
        d = eset.start(args.n)
558
        d = eset.start(args.n)
519
522
        return d
559
        return d
527
523
    def delay_start(cont_pid):
560
    config = kernel_config_manager.get_config_obj()
528
524
        # This is needed because the controller doesn't start listening
561
    furl_file = config['controller']['engine_furl_file']
529
525
        # right when it starts and the controller needs to write
562
    dstart.addCallback(_delay_start, start_engines, furl_file, args.r)
530
526
        # furl files for the engine to pick up
563
    dstart.addErrback(_err_and_stop)
524
527
        reactor.callLater(1.0, start_engines, cont_pid)
525
528
    dstart.addCallback(delay_start)
526
529
    dstart.addErrback(lambda f: f.raiseException())
531
530
564
532
531
565
533
532
def main_mpi(args):
566
def main_mpi(args):
534
@@ -562,13 +596,10 @@
535
562
        signal.signal(signal.SIGINT,shutdown)
596
        signal.signal(signal.SIGINT,shutdown)
536
563
        d = eset.start()
597
        d = eset.start()
537
564
        return d
598
        return d
545
565
    def delay_start(cont_pid):
599
    config = kernel_config_manager.get_config_obj()
546
566
        # This is needed because the controller doesn't start listening
600
    furl_file = config['controller']['engine_furl_file']
547
567
        # right when it starts and the controller needs to write
601
    dstart.addCallback(_delay_start, start_engines, furl_file, args.r)
548
568
        # furl files for the engine to pick up
602
    dstart.addErrback(_err_and_stop)
542
569
        reactor.callLater(1.0, start_engines, cont_pid)
543
570
    dstart.addCallback(delay_start)
544
571
    dstart.addErrback(lambda f: f.raiseException())
549
572
603
550
573
604
551
574
def main_pbs(args):
605
def main_pbs(args):
552
@@ -595,8 +626,10 @@
553
595
        signal.signal(signal.SIGINT,shutdown)
626
        signal.signal(signal.SIGINT,shutdown)
554
596
        d = pbs_set.start(args.n)
627
        d = pbs_set.start(args.n)
555
597
        return d
628
        return d
558
598
    dstart.addCallback(start_engines)
629
    config = kernel_config_manager.get_config_obj()
559
599
    dstart.addErrback(lambda f: f.raiseException())
630
    furl_file = config['controller']['engine_furl_file']
560
631
    dstart.addCallback(_delay_start, start_engines, furl_file, args.r)
561
632
    dstart.addErrback(_err_and_stop)
562
600
633
563
601
634
564
602
def main_ssh(args):
635
def main_ssh(args):
565
@@ -637,12 +670,10 @@
566
637
        signal.signal(signal.SIGINT,shutdown)
670
        signal.signal(signal.SIGINT,shutdown)
567
638
        d = ssh_set.start(clusterfile['send_furl'])
671
        d = ssh_set.start(clusterfile['send_furl'])
568
639
        return d
672
        return d
575
640
    
673
    config = kernel_config_manager.get_config_obj()
576
641
    def delay_start(cont_pid):
674
    furl_file = config['controller']['engine_furl_file']
577
642
        reactor.callLater(1.0, start_engines, cont_pid)
675
    dstart.addCallback(_delay_start, start_engines, furl_file, args.r)
578
643
        
676
    dstart.addErrback(_err_and_stop)
573
644
    dstart.addCallback(delay_start)
574
645
    dstart.addErrback(lambda f: f.raiseException())
579
646
677
580
647
678
581
648
def get_args():
679
def get_args():
582
649
680
583
=== modified file 'IPython/kernel/scripts/ipcontroller.py'
584
--- IPython/kernel/scripts/ipcontroller.py	2009-03-15 01:38:00 +0000
585
+++ IPython/kernel/scripts/ipcontroller.py	2009-04-18 23:24:22 +0000
586
@@ -22,6 +22,7 @@
587
22
sys.path.insert(0, '')
22
sys.path.insert(0, '')
588
23
23
589
24
import sys, time, os
24
import sys, time, os
590
25
import tempfile
591
25
from optparse import OptionParser
26
from optparse import OptionParser
592
26
27
593
27
from twisted.application import internet, service
28
from twisted.application import internet, service
594
@@ -37,6 +38,18 @@
595
37
from IPython.kernel import controllerservice
38
from IPython.kernel import controllerservice
596
38
from IPython.kernel.fcutil import check_furl_file_security
39
from IPython.kernel.fcutil import check_furl_file_security
597
39
40
598
41
# Create various ipython directories if they don't exist.
599
42
# This must be done before IPython.kernel.config is imported.
600
43
from IPython.iplib import user_setup
601
44
from IPython.genutils import get_ipython_dir, get_log_dir, get_security_dir
602
45
if os.name == 'posix':
603
46
    rc_suffix = ''
604
47
else:
605
48
    rc_suffix = '.ini'
606
49
user_setup(get_ipython_dir(), rc_suffix, mode='install', interactive=False)
607
50
get_log_dir()
608
51
get_security_dir()
609
52
610
40
from IPython.kernel.config import config_manager as kernel_config_manager
53
from IPython.kernel.config import config_manager as kernel_config_manager
611
41
from IPython.config.cutils import import_item
54
from IPython.config.cutils import import_item
612
42
55
613
@@ -45,6 +58,10 @@
614
45
# Code
58
# Code
615
46
#-------------------------------------------------------------------------------
59
#-------------------------------------------------------------------------------
616
47
60
617
61
def get_temp_furlfile(filename):
618
62
    return tempfile.mktemp(dir=os.path.dirname(filename),
619
63
                           prefix=os.path.basename(filename))
620
64
621
48
def make_tub(ip, port, secure, cert_file):
65
def make_tub(ip, port, secure, cert_file):
622
49
    """
66
    """
623
50
    Create a listening tub given an ip, port, and cert_file location.
67
    Create a listening tub given an ip, port, and cert_file location.
624
@@ -107,13 +124,18 @@
625
107
        """Set the location for the tub and return a deferred."""
124
        """Set the location for the tub and return a deferred."""
626
108
125
627
109
        def register(empty, ref, furl_file):
126
        def register(empty, ref, furl_file):
629
110
            client_tub.registerReference(ref, furlFile=furl_file)
127
            # We create and then move to make sure that when the file
630
128
            # appears to other processes, the buffer has the flushed
631
129
            # and the file has been closed
632
130
            temp_furl_file = get_temp_furlfile(furl_file)
633
131
            client_tub.registerReference(ref, furlFile=temp_furl_file)
634
132
            os.rename(temp_furl_file, furl_file)
635
111
        
133
        
636
112
        if location == '':
134
        if location == '':
637
113
            d = client_tub.setLocationAutomatically()
135
            d = client_tub.setLocationAutomatically()
638
114
        else:
136
        else:
639
115
            d = defer.maybeDeferred(client_tub.setLocation, "%s:%i" % (location, client_listener.getPortnum()))
137
            d = defer.maybeDeferred(client_tub.setLocation, "%s:%i" % (location, client_listener.getPortnum()))
641
116
            
138
        
642
117
        for ciname, ci in config['controller']['controller_interfaces'].iteritems():
139
        for ciname, ci in config['controller']['controller_interfaces'].iteritems():
643
118
            log.msg("Adapting Controller to interface: %s" % ciname)
140
            log.msg("Adapting Controller to interface: %s" % ciname)
644
119
            furl_file = ci['furl_file']
141
            furl_file = ci['furl_file']
645
@@ -154,7 +176,12 @@
646
154
        """Set the location for the tub and return a deferred."""
176
        """Set the location for the tub and return a deferred."""
647
155
177
648
156
        def register(empty, ref, furl_file):
178
        def register(empty, ref, furl_file):
650
157
            engine_tub.registerReference(ref, furlFile=furl_file)
179
            # We create and then move to make sure that when the file
651
180
            # appears to other processes, the buffer has the flushed
652
181
            # and the file has been closed
653
182
            temp_furl_file = get_temp_furlfile(furl_file)
654
183
            engine_tub.registerReference(ref, furlFile=temp_furl_file)
655
184
            os.rename(temp_furl_file, furl_file)
656
158
        
185
        
657
159
        if location == '':
186
        if location == '':
658
160
            d = engine_tub.setLocationAutomatically()
187
            d = engine_tub.setLocationAutomatically()
659
@@ -325,12 +352,6 @@
660
325
        help="log file name (default is stdout)"
352
        help="log file name (default is stdout)"
661
326
    )
353
    )
662
327
    parser.add_option(
354
    parser.add_option(
663
328
        "--ipythondir",
664
329
        type="string",
665
330
        dest="ipythondir",
666
331
        help="look for config files and profiles in this directory"
667
332
    )
668
333
    parser.add_option(
669
334
        "-r",
355
        "-r",
670
335
        action="store_true",
356
        action="store_true",
671
336
        dest="reuse_furls",
357
        dest="reuse_furls",
672
@@ -339,7 +360,6 @@
673
339
    
360
    
674
340
    (options, args) = parser.parse_args()
361
    (options, args) = parser.parse_args()
675
341
    
362
    
676
342
    kernel_config_manager.update_config_obj_from_default_file(options.ipythondir)
677
343
    config = kernel_config_manager.get_config_obj()
363
    config = kernel_config_manager.get_config_obj()
678
344
    
364
    
679
345
    # Update with command line options
365
    # Update with command line options
680
346
366
681
=== modified file 'IPython/kernel/scripts/ipengine.py'
682
--- IPython/kernel/scripts/ipengine.py	2009-03-15 01:38:00 +0000
683
+++ IPython/kernel/scripts/ipengine.py	2009-04-18 23:24:22 +0000
684
@@ -33,6 +33,19 @@
685
33
from IPython.kernel.core.config import config_manager as core_config_manager
33
from IPython.kernel.core.config import config_manager as core_config_manager
686
34
from IPython.config.cutils import import_item
34
from IPython.config.cutils import import_item
687
35
from IPython.kernel.engineservice import EngineService
35
from IPython.kernel.engineservice import EngineService
688
36
689
37
# Create various ipython directories if they don't exist.
690
38
# This must be done before IPython.kernel.config is imported.
691
39
from IPython.iplib import user_setup
692
40
from IPython.genutils import get_ipython_dir, get_log_dir, get_security_dir
693
41
if os.name == 'posix':
694
42
    rc_suffix = ''
695
43
else:
696
44
    rc_suffix = '.ini'
697
45
user_setup(get_ipython_dir(), rc_suffix, mode='install', interactive=False)
698
46
get_log_dir()
699
47
get_security_dir()
700
48
701
36
from IPython.kernel.config import config_manager as kernel_config_manager
49
from IPython.kernel.config import config_manager as kernel_config_manager
702
37
from IPython.kernel.engineconnector import EngineConnector
50
from IPython.kernel.engineconnector import EngineConnector
703
38
51
704
@@ -106,13 +119,19 @@
705
106
    engine_connector = EngineConnector(tub_service)
119
    engine_connector = EngineConnector(tub_service)
706
107
    furl_file = kernel_config['engine']['furl_file']
120
    furl_file = kernel_config['engine']['furl_file']
707
108
    log.msg("Using furl file: %s" % furl_file)
121
    log.msg("Using furl file: %s" % furl_file)
715
109
    d = engine_connector.connect_to_controller(engine_service, furl_file)
122
    
716
110
    def handle_error(f):
123
    def call_connect(engine_service, furl_file):
717
111
        log.err(f)
124
        d = engine_connector.connect_to_controller(engine_service, furl_file)
718
112
        if reactor.running:
125
        def handle_error(f):
719
113
            reactor.stop()
126
            # If this print statement is replaced by a log.err(f) I get
720
114
    d.addErrback(handle_error)
127
            # an unhandled error, which makes no sense.  I shouldn't have
721
115
    
128
            # to use a print statement here.  My only thought is that
722
129
            # at the beginning of the process the logging is still starting up
723
130
            print "error connecting to controller:", f.getErrorMessage()
724
131
            reactor.callLater(0.1, reactor.stop)
725
132
        d.addErrback(handle_error)
726
133
    
727
134
    reactor.callWhenRunning(call_connect, engine_service, furl_file)
728
116
    reactor.run()
135
    reactor.run()
729
117
136
730
118
137
731
@@ -142,18 +161,9 @@
732
142
        dest="logfile",
161
        dest="logfile",
733
143
        help="log file name (default is stdout)"
162
        help="log file name (default is stdout)"
734
144
    )
163
    )
735
145
    parser.add_option(
736
146
        "--ipythondir",
737
147
        type="string",
738
148
        dest="ipythondir",
739
149
        help="look for config files and profiles in this directory"
740
150
    )
741
151
    
164
    
742
152
    (options, args) = parser.parse_args()
165
    (options, args) = parser.parse_args()
743
153
    
166
    
744
154
    kernel_config_manager.update_config_obj_from_default_file(options.ipythondir)
745
155
    core_config_manager.update_config_obj_from_default_file(options.ipythondir)
746
156
    
747
157
    kernel_config = kernel_config_manager.get_config_obj()
167
    kernel_config = kernel_config_manager.get_config_obj()
748
158
    # Now override with command line options
168
    # Now override with command line options
749
159
    if options.furl_file is not None:
169
    if options.furl_file is not None:
750
160
170
751
=== modified file 'IPython/kernel/tests/test_multiengine.py'
752
--- IPython/kernel/tests/test_multiengine.py	2008-08-23 23:06:36 +0000
753
+++ IPython/kernel/tests/test_multiengine.py	2009-04-18 21:53:37 +0000
754
@@ -4,16 +4,16 @@
755
4
4
756
5
__docformat__ = "restructuredtext en"
5
__docformat__ = "restructuredtext en"
757
6
6
759
7
#-------------------------------------------------------------------------------
7
#-----------------------------------------------------------------------------
760
8
#  Copyright (C) 2008  The IPython Development Team
8
#  Copyright (C) 2008  The IPython Development Team
761
9
#
9
#
762
10
#  Distributed under the terms of the BSD License.  The full license is in
10
#  Distributed under the terms of the BSD License.  The full license is in
763
11
#  the file COPYING, distributed as part of this software.
11
#  the file COPYING, distributed as part of this software.
765
12
#-------------------------------------------------------------------------------
12
#-----------------------------------------------------------------------------
766
13
13
768
14
#-------------------------------------------------------------------------------
14
#-----------------------------------------------------------------------------
769
15
# Imports
15
# Imports
771
16
#-------------------------------------------------------------------------------
16
#-----------------------------------------------------------------------------
772
17
17
773
18
try:
18
try:
774
19
    from twisted.internet import defer
19
    from twisted.internet import defer
775
20
20
776
=== modified file 'IPython/kernel/tests/test_newserialized.py'
777
--- IPython/kernel/tests/test_newserialized.py	2008-08-23 23:06:36 +0000
778
+++ IPython/kernel/tests/test_newserialized.py	2009-04-18 21:53:37 +0000
779
@@ -4,16 +4,16 @@
780
4
4
781
5
__docformat__ = "restructuredtext en"
5
__docformat__ = "restructuredtext en"
782
6
6
784
7
#-------------------------------------------------------------------------------
7
#-----------------------------------------------------------------------------
785
8
#  Copyright (C) 2008  The IPython Development Team
8
#  Copyright (C) 2008  The IPython Development Team
786
9
#
9
#
787
10
#  Distributed under the terms of the BSD License.  The full license is in
10
#  Distributed under the terms of the BSD License.  The full license is in
788
11
#  the file COPYING, distributed as part of this software.
11
#  the file COPYING, distributed as part of this software.
790
12
#-------------------------------------------------------------------------------
12
#-----------------------------------------------------------------------------
791
13
13
793
14
#-------------------------------------------------------------------------------
14
#-----------------------------------------------------------------------------
794
15
# Imports
15
# Imports
796
16
#-------------------------------------------------------------------------------
16
#-----------------------------------------------------------------------------
797
17
17
798
18
try:
18
try:
799
19
    import zope.interface as zi
19
    import zope.interface as zi
800
@@ -31,9 +31,9 @@
801
31
    import nose
31
    import nose
802
32
    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
32
    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
803
33
33
805
34
#-------------------------------------------------------------------------------
34
#-----------------------------------------------------------------------------
806
35
# Tests
35
# Tests
808
36
#-------------------------------------------------------------------------------
36
#-----------------------------------------------------------------------------
809
37
37
810
38
class SerializedTestCase(unittest.TestCase):
38
class SerializedTestCase(unittest.TestCase):
811
39
39
812
40
40
813
=== modified file 'IPython/kernel/twistedutil.py'
814
--- IPython/kernel/twistedutil.py	2008-06-06 19:41:55 +0000
815
+++ IPython/kernel/twistedutil.py	2009-04-18 21:53:37 +0000
816
@@ -16,12 +16,15 @@
817
16
# Imports
16
# Imports
818
17
#-------------------------------------------------------------------------------
17
#-------------------------------------------------------------------------------
819
18
18
820
19
import os, sys
821
19
import threading, Queue, atexit
20
import threading, Queue, atexit
822
21
823
20
import twisted
22
import twisted
824
21
825
22
from twisted.internet import defer, reactor
23
from twisted.internet import defer, reactor
826
23
from twisted.python import log, failure
24
from twisted.python import log, failure
827
24
25
828
26
from IPython.kernel.error import FileTimeoutError
829
27
830
25
#-------------------------------------------------------------------------------
28
#-------------------------------------------------------------------------------
831
26
# Classes related to twisted and threads
29
# Classes related to twisted and threads
832
27
#-------------------------------------------------------------------------------
30
#-------------------------------------------------------------------------------
833
@@ -204,3 +207,43 @@
834
204
            result = None
207
            result = None
835
205
208
836
206
        return result
209
        return result
837
210
838
211
839
212
def wait_for_file(filename, delay=0.1, max_tries=10):
840
213
    """Wait (poll) for a file to be created.
841
214
    
842
215
    This method returns a Deferred that will fire when a file exists. It
843
216
    works by polling os.path.isfile in time intervals specified by the
844
217
    delay argument.  If `max_tries` is reached, it will errback with a 
845
218
    `FileTimeoutError`.
846
219
    
847
220
    Parameters
848
221
    ----------
849
222
    filename : str
850
223
        The name of the file to wait for.
851
224
    delay : float
852
225
        The time to wait between polls.
853
226
    max_tries : int
854
227
        The max number of attempts before raising `FileTimeoutError`
855
228
    
856
229
    Returns
857
230
    -------
858
231
    d : Deferred
859
232
        A Deferred instance that will fire when the file exists.
860
233
    """
861
234
    
862
235
    d = defer.Deferred()
863
236
    
864
237
    def _test_for_file(filename, attempt=0):
865
238
        if attempt >= max_tries:
866
239
            d.errback(FileTimeoutError(
867
240
                'timeout waiting for file to be created: %s' % filename
868
241
            ))
869
242
        else:
870
243
            if os.path.isfile(filename):
871
244
                d.callback(True)
872
245
            else:
873
246
                reactor.callLater(delay, _test_for_file, filename, attempt+1)
874
247
    
875
248
    _test_for_file(filename)
876
249
    return d
877
207
250
878
=== modified file 'IPython/tests/test_genutils.py'
879
--- IPython/tests/test_genutils.py	2009-03-11 17:44:53 +0000
880
+++ IPython/tests/test_genutils.py	2009-04-18 23:24:22 +0000
881
@@ -210,7 +210,6 @@
882
210
    home_dir = genutils.get_home_dir()
210
    home_dir = genutils.get_home_dir()
883
211
    nt.assert_equal(home_dir, abspath(HOME_TEST_DIR))
211
    nt.assert_equal(home_dir, abspath(HOME_TEST_DIR))
884
212
212
885
213
886
214
#
213
#
887
215
# Tests for get_ipython_dir
214
# Tests for get_ipython_dir
888
216
#
215
#
889
@@ -239,7 +238,6 @@
890
239
    ipdir = genutils.get_ipython_dir()
238
    ipdir = genutils.get_ipython_dir()
891
240
    nt.assert_equal(ipdir, os.path.abspath(os.path.join("someplace", "_ipython")))
239
    nt.assert_equal(ipdir, os.path.abspath(os.path.join("someplace", "_ipython")))
892
241
240
893
242
894
243
#
241
#
895
244
# Tests for get_security_dir
242
# Tests for get_security_dir
896
245
#
243
#
897
@@ -249,6 +247,14 @@
898
249
    """Testcase to see if we can call get_security_dir without Exceptions."""
247
    """Testcase to see if we can call get_security_dir without Exceptions."""
899
250
    sdir = genutils.get_security_dir()
248
    sdir = genutils.get_security_dir()
900
251
249
901
250
#
902
251
# Tests for get_log_dir
903
252
#
904
253
905
254
@with_enivronment
906
255
def test_get_log_dir():
907
256
    """Testcase to see if we can call get_log_dir without Exceptions."""
908
257
    sdir = genutils.get_log_dir()
909
252
258
910
253
#
259
#
911
254
# Tests for popkey
260
# Tests for popkey
912
255
261
913
=== modified file 'docs/source/parallel/parallel_process.txt'
914
--- docs/source/parallel/parallel_process.txt	2009-03-18 18:45:20 +0000
915
+++ docs/source/parallel/parallel_process.txt	2009-04-18 21:53:37 +0000
916
@@ -302,18 +302,33 @@
917
302
Make FURL files persistent
302
Make FURL files persistent
918
303
---------------------------
303
---------------------------
919
304
304
923
305
At fist glance it may seem that that managing the FURL files is a bit annoying.  Going back to the house and key analogy, copying the FURL around each time you start the controller is like having to make a new key every time you want to unlock the door and enter your house.  As with your house, you want to be able to create the key (or FURL file) once, and then simply use it at any point in the future.
305
At fist glance it may seem that that managing the FURL files is a bit
924
306
306
annoying. Going back to the house and key analogy, copying the FURL around
925
307
This is possible.  The only thing you have to do is decide what ports the controller will listen on for the engines and clients.  This is done as follows::
307
each time you start the controller is like having to make a new key every time
926
308
you want to unlock the door and enter your house. As with your house, you want
927
309
to be able to create the key (or FURL file) once, and then simply use it at
928
310
any point in the future.
929
311
930
312
This is possible. but before you do this, you **must** remove any old FURL
931
313
files in the :file:`~/.ipython/security` directory.
932
314
933
315
.. warning::
934
316
935
317
    You **must** remove old FURL files before using persistent FURL files.
936
318
937
319
Then, The only thing you have to do is decide what ports the controller will
938
320
listen on for the engines and clients. This is done as follows::
939
308
321
940
309
    $ ipcontroller -r --client-port=10101 --engine-port=10102
322
    $ ipcontroller -r --client-port=10101 --engine-port=10102
941
310
323
943
311
These options also work with all of the various modes of 
324
These options also work with all of the various modes of
944
312
:command:`ipcluster`::
325
:command:`ipcluster`::
945
313
326
946
314
    $ ipcluster local -n 2 -r --client-port=10101 --engine-port=10102
327
    $ ipcluster local -n 2 -r --client-port=10101 --engine-port=10102
947
315
328
949
316
Then, just copy the furl files over the first time and you are set.  You can start and stop the controller and engines any many times as you want in the future, just make sure to tell the controller to use the *same* ports.
329
Then, just copy the furl files over the first time and you are set. You can
950
330
start and stop the controller and engines any many times as you want in the
951
331
future, just make sure to tell the controller to use the *same* ports.
952
317
332
953
318
.. note::
333
.. note::
954
319
334
Reviewer	Review Type	Date Requested	Status
Fernando Perez		2009-04-20	Needs Fixing on 2009-04-22
Review via email: mp+5716@code.launchpad.net