patches/ipython-02-python-version.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 17094 93a24ff5a6bd
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17094
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     1
diff -u -r ipython-0.10/IPython/Extensions/ipy_gnuglobal.py ipython-0.10-mod/IPython/Extensions/ipy_gnuglobal.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     2
--- ipython-0.10/IPython/Extensions/ipy_gnuglobal.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     3
+++ ipython-0.10-mod/IPython/Extensions/ipy_gnuglobal.py	2009-12-03 18:20:38.880459000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     4
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     5
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     6
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     7
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     8
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
     9
 """
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    10
diff -u -r ipython-0.10/IPython/Extensions/ipy_render.py ipython-0.10-mod/IPython/Extensions/ipy_render.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    11
--- ipython-0.10/IPython/Extensions/ipy_render.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    12
+++ ipython-0.10-mod/IPython/Extensions/ipy_render.py	2009-12-03 18:20:51.158114000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    13
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    14
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    15
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    16
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    17
 """ IPython extension: Render templates from variables and paste to clipbard """
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    18
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    19
diff -u -r ipython-0.10/IPython/Extensions/ipy_workdir.py ipython-0.10-mod/IPython/Extensions/ipy_workdir.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    20
--- ipython-0.10/IPython/Extensions/ipy_workdir.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    21
+++ ipython-0.10-mod/IPython/Extensions/ipy_workdir.py	2009-12-03 18:21:10.082806000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    22
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    23
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    24
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    25
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    26
 import IPython.ipapi
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    27
 ip = IPython.ipapi.get()
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    28
diff -u -r ipython-0.10/IPython/Extensions/pickleshare.py ipython-0.10-mod/IPython/Extensions/pickleshare.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    29
--- ipython-0.10/IPython/Extensions/pickleshare.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    30
+++ ipython-0.10-mod/IPython/Extensions/pickleshare.py	2009-12-03 18:21:21.147371000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    31
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    32
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    33
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    34
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    35
 """ PickleShare - a small 'shelve' like datastore with concurrency support
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    36
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    37
diff -u -r ipython-0.10/IPython/external/guid.py ipython-0.10-mod/IPython/external/guid.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    38
--- ipython-0.10/IPython/external/guid.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    39
+++ ipython-0.10-mod/IPython/external/guid.py	2009-12-03 18:21:36.703943000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    40
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    41
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    42
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    43
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    44
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    45
 # GUID.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    46
diff -u -r ipython-0.10/IPython/external/mglob.py ipython-0.10-mod/IPython/external/mglob.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    47
--- ipython-0.10/IPython/external/mglob.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    48
+++ ipython-0.10-mod/IPython/external/mglob.py	2009-12-03 18:21:53.144675000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    49
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    50
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    51
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    52
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    53
 r""" mglob - enhanced file list expansion module
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    54
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    55
diff -u -r ipython-0.10/IPython/gui/wx/ipshell_nonblocking.py ipython-0.10-mod/IPython/gui/wx/ipshell_nonblocking.py
17091
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    56
--- ipython-0.10/IPython/gui/wx/ipshell_nonblocking.py	2009-08-05 07:26:20.000000000 +0800
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    57
+++ ipython-0.10-mod/IPython/gui/wx/ipshell_nonblocking.py	2009-12-03 17:20:28.337476000 +0800
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    58
@@ -1,4 +1,4 @@
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    59
-#!/usr/bin/python
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    60
+#!/usr/bin/python2.6
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    61
 # -*- coding: iso-8859-15 -*-
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    62
 '''
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    63
 Provides IPython remote instance.
17094
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    64
diff -u -r ipython-0.10/IPython/gui/wx/ipython_history.py ipython-0.10-mod/IPython/gui/wx/ipython_history.py
17091
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    65
--- ipython-0.10/IPython/gui/wx/ipython_history.py	2009-04-16 08:58:05.000000000 +0800
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    66
+++ ipython-0.10-mod/IPython/gui/wx/ipython_history.py	2009-12-03 17:20:39.533998000 +0800
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    67
@@ -1,4 +1,4 @@
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    68
-#!/usr/bin/python
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    69
+#!/usr/bin/python2.6
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    70
 # -*- coding: iso-8859-15 -*-
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    71
 import wx
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    72
 import wx.stc  as  stc
17094
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    73
diff -u -r ipython-0.10/IPython/gui/wx/ipython_view.py ipython-0.10-mod/IPython/gui/wx/ipython_view.py
17091
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    74
--- ipython-0.10/IPython/gui/wx/ipython_view.py	2009-08-05 07:26:20.000000000 +0800
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    75
+++ ipython-0.10-mod/IPython/gui/wx/ipython_view.py	2009-12-03 17:20:46.877974000 +0800
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    76
@@ -1,4 +1,4 @@
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    77
-#!/usr/bin/python
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    78
+#!/usr/bin/python2.6
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    79
 # -*- coding: utf-8 -*-
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    80
 '''
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    81
 Provides IPython WX console widgets.
17094
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    82
diff -u -r ipython-0.10/IPython/gui/wx/wxIPython.py ipython-0.10-mod/IPython/gui/wx/wxIPython.py
17091
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    83
--- ipython-0.10/IPython/gui/wx/wxIPython.py	2009-04-16 08:58:05.000000000 +0800
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    84
+++ ipython-0.10-mod/IPython/gui/wx/wxIPython.py	2009-12-03 17:20:55.390569000 +0800
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    85
@@ -1,4 +1,4 @@
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    86
-#!/usr/bin/python
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    87
+#!/usr/bin/python2.6
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    88
 # -*- coding: iso-8859-15 -*-
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    89
 
7411935620b3 2009-12-03 Li Yuan <[email protected]>
liyuan
parents:
diff changeset
    90
 import wx.aui
17094
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    91
diff -u -r ipython-0.10/IPython/irunner.py ipython-0.10-mod/IPython/irunner.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    92
--- ipython-0.10/IPython/irunner.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    93
+++ ipython-0.10-mod/IPython/irunner.py	2009-12-03 18:22:08.221310000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    94
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    95
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    96
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    97
 """Module for interactively running scripts.
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    98
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
    99
 This module implements classes for interactively running scripts written for
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   100
diff -u -r ipython-0.10/IPython/kernel/scripts/ipcluster.py ipython-0.10-mod/IPython/kernel/scripts/ipcluster.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   101
--- ipython-0.10/IPython/kernel/scripts/ipcluster.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   102
+++ ipython-0.10-mod/IPython/kernel/scripts/ipcluster.py	2009-12-03 18:22:42.874864000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   103
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   104
- #!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   105
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   106
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   107
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   108
 """Start an IPython cluster = (controller + engines)."""
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   109
diff -u -r ipython-0.10/IPython/kernel/scripts/ipcontroller.py ipython-0.10-mod/IPython/kernel/scripts/ipcontroller.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   110
--- ipython-0.10/IPython/kernel/scripts/ipcontroller.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   111
+++ ipython-0.10-mod/IPython/kernel/scripts/ipcontroller.py	2009-12-03 18:22:54.607200000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   112
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   113
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   114
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   115
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   116
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   117
 """The IPython controller."""
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   118
diff -u -r ipython-0.10/IPython/kernel/scripts/ipengine.py ipython-0.10-mod/IPython/kernel/scripts/ipengine.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   119
--- ipython-0.10/IPython/kernel/scripts/ipengine.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   120
+++ ipython-0.10-mod/IPython/kernel/scripts/ipengine.py	2009-12-03 18:23:08.051740000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   121
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   122
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   123
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   124
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   125
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   126
 """Start the IPython Engine."""
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   127
diff -u -r ipython-0.10/IPython/kernel/tests/tasktest.py ipython-0.10-mod/IPython/kernel/tests/tasktest.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   128
--- ipython-0.10/IPython/kernel/tests/tasktest.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   129
+++ ipython-0.10-mod/IPython/kernel/tests/tasktest.py	2009-12-03 18:23:41.773115000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   130
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   131
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   132
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   133
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   134
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   135
 __docformat__ = "restructuredtext en"
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   136
diff -u -r ipython-0.10/IPython/kernel/tests/test_multienginefc.py ipython-0.10-mod/IPython/kernel/tests/test_multienginefc.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   137
--- ipython-0.10/IPython/kernel/tests/test_multienginefc.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   138
+++ ipython-0.10-mod/IPython/kernel/tests/test_multienginefc.py	2009-12-03 18:23:56.041823000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   139
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   140
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   141
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   142
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   143
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   144
 __docformat__ = "restructuredtext en"
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   145
diff -u -r ipython-0.10/IPython/kernel/tests/test_pendingdeferred.py ipython-0.10-mod/IPython/kernel/tests/test_pendingdeferred.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   146
--- ipython-0.10/IPython/kernel/tests/test_pendingdeferred.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   147
+++ ipython-0.10-mod/IPython/kernel/tests/test_pendingdeferred.py	2009-12-03 18:24:07.694115000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   148
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   149
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   150
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   151
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   152
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   153
 """Tests for pendingdeferred.py"""
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   154
diff -u -r ipython-0.10/IPython/kernel/tests/test_taskfc.py ipython-0.10-mod/IPython/kernel/tests/test_taskfc.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   155
--- ipython-0.10/IPython/kernel/tests/test_taskfc.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   156
+++ ipython-0.10-mod/IPython/kernel/tests/test_taskfc.py	2009-12-03 18:24:20.102827000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   157
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   158
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   159
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   160
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   161
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   162
 __docformat__ = "restructuredtext en"
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   163
diff -u -r ipython-0.10/IPython/kernel/tests/test_twistedutil.py ipython-0.10-mod/IPython/kernel/tests/test_twistedutil.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   164
--- ipython-0.10/IPython/kernel/tests/test_twistedutil.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   165
+++ ipython-0.10-mod/IPython/kernel/tests/test_twistedutil.py	2009-12-03 18:24:32.170143000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   166
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   167
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   168
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   169
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   170
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   171
 #-----------------------------------------------------------------------------
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   172
diff -u -r ipython-0.10/IPython/kernel/twistedutil.py ipython-0.10-mod/IPython/kernel/twistedutil.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   173
--- ipython-0.10/IPython/kernel/twistedutil.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   174
+++ ipython-0.10-mod/IPython/kernel/twistedutil.py	2009-12-03 18:24:45.051707000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   175
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   176
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   177
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   178
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   179
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   180
 """Things directly related to all of twisted."""
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   181
diff -u -r ipython-0.10/IPython/testing/mkdoctests.py ipython-0.10-mod/IPython/testing/mkdoctests.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   182
--- ipython-0.10/IPython/testing/mkdoctests.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   183
+++ ipython-0.10-mod/IPython/testing/mkdoctests.py	2009-12-03 18:24:56.944150000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   184
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   185
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   186
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   187
 """Utility for making a doctest file out of Python or IPython input.
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   188
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   189
   %prog [options] input_file [output_file]
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   190
diff -u -r ipython-0.10/IPython/testing/plugin/iptest.py ipython-0.10-mod/IPython/testing/plugin/iptest.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   191
--- ipython-0.10/IPython/testing/plugin/iptest.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   192
+++ ipython-0.10-mod/IPython/testing/plugin/iptest.py	2009-12-03 18:25:09.060578000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   193
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   194
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   195
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   196
 """Nose-based test runner.
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   197
 """
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   198
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   199
diff -u -r ipython-0.10/IPython/testing/plugin/setup.py ipython-0.10-mod/IPython/testing/plugin/setup.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   200
--- ipython-0.10/IPython/testing/plugin/setup.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   201
+++ ipython-0.10-mod/IPython/testing/plugin/setup.py	2009-12-03 18:25:25.724270000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   202
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   203
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   204
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   205
 """A Nose plugin to support IPython doctests.
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   206
 """
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   207
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   208
diff -u -r ipython-0.10/IPython/testing/tests/test_tools.py ipython-0.10-mod/IPython/testing/tests/test_tools.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   209
--- ipython-0.10/IPython/testing/tests/test_tools.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   210
+++ ipython-0.10-mod/IPython/testing/tests/test_tools.py	2009-12-03 18:25:42.885276000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   211
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   212
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   213
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   214
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   215
 """
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   216
 Tests for testing.tools
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   217
diff -u -r ipython-0.10/IPython/tests/test_platutils.py ipython-0.10-mod/IPython/tests/test_platutils.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   218
--- ipython-0.10/IPython/tests/test_platutils.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   219
+++ ipython-0.10-mod/IPython/tests/test_platutils.py	2009-12-03 18:26:07.405976000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   220
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   221
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   222
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   223
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   224
 """
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   225
 Tests for platutils.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   226
diff -u -r ipython-0.10/IPython/tools/growl.py ipython-0.10-mod/IPython/tools/growl.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   227
--- ipython-0.10/IPython/tools/growl.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   228
+++ ipython-0.10-mod/IPython/tools/growl.py	2009-12-03 18:26:19.443542000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   229
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   230
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   231
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   232
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   233
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   234
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   235
diff -u -r ipython-0.10/IPython/upgrade_dir.py ipython-0.10-mod/IPython/upgrade_dir.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   236
--- ipython-0.10/IPython/upgrade_dir.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   237
+++ ipython-0.10-mod/IPython/upgrade_dir.py	2009-12-03 18:26:31.592030000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   238
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   239
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   240
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   241
 """ A script/util to upgrade all files in a directory
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   242
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   243
 This is rather conservative in its approach, only copying/overwriting
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   244
diff -u -r ipython-0.10/docs/examples/core/example-embed.py ipython-0.10-mod/docs/examples/core/example-embed.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   245
--- ipython-0.10/docs/examples/core/example-embed.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   246
+++ ipython-0.10-mod/docs/examples/core/example-embed.py	2009-12-03 18:28:58.464911000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   247
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   248
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   249
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   250
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   251
 """An example of how to embed an IPython shell into a running program.
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   252
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   253
diff -u -r ipython-0.10/docs/examples/core/example-gnuplot.py ipython-0.10-mod/docs/examples/core/example-gnuplot.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   254
--- ipython-0.10/docs/examples/core/example-gnuplot.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   255
+++ ipython-0.10-mod/docs/examples/core/example-gnuplot.py	2009-12-03 18:29:24.456668000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   256
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   257
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   258
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   259
 """
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   260
 Example code showing how to use Gnuplot and an embedded IPython shell.
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   261
 """
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   262
diff -u -r ipython-0.10/docs/examples/kernel/asyncmultiengine1.py ipython-0.10-mod/docs/examples/kernel/asyncmultiengine1.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   263
--- ipython-0.10/docs/examples/kernel/asyncmultiengine1.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   264
+++ ipython-0.10-mod/docs/examples/kernel/asyncmultiengine1.py	2009-12-03 18:34:59.696800000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   265
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   266
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   267
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   268
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   269
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   270
 # A super simple example showing how to use all of this in a fully
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   271
diff -u -r ipython-0.10/docs/examples/kernel/mcdriver.py ipython-0.10-mod/docs/examples/kernel/mcdriver.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   272
--- ipython-0.10/docs/examples/kernel/mcdriver.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   273
+++ ipython-0.10-mod/docs/examples/kernel/mcdriver.py	2009-12-03 18:30:02.916678000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   274
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   275
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   276
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   277
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   278
 """Run a Monte-Carlo options pricer in parallel."""
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   279
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   280
diff -u -r ipython-0.10/docs/examples/kernel/pwordfreq.py ipython-0.10-mod/docs/examples/kernel/pwordfreq.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   281
--- ipython-0.10/docs/examples/kernel/pwordfreq.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   282
+++ ipython-0.10-mod/docs/examples/kernel/pwordfreq.py	2009-12-03 18:30:18.821296000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   283
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   284
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   285
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   286
 """Parallel word frequency counter."""
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   287
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   288
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   289
diff -u -r ipython-0.10/docs/examples/kernel/pwordfreq_skel.py ipython-0.10-mod/docs/examples/kernel/pwordfreq_skel.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   290
--- ipython-0.10/docs/examples/kernel/pwordfreq_skel.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   291
+++ ipython-0.10-mod/docs/examples/kernel/pwordfreq_skel.py	2009-12-03 18:30:25.857571000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   292
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   293
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   294
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   295
 """Parallel word frequency counter."""
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   296
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   297
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   298
diff -u -r ipython-0.10/docs/examples/kernel/task2.py ipython-0.10-mod/docs/examples/kernel/task2.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   299
--- ipython-0.10/docs/examples/kernel/task2.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   300
+++ ipython-0.10-mod/docs/examples/kernel/task2.py	2009-12-03 18:30:39.458089000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   301
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   302
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   303
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   304
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   305
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   306
 from IPython.kernel import client
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   307
diff -u -r ipython-0.10/docs/examples/kernel/task_profiler.py ipython-0.10-mod/docs/examples/kernel/task_profiler.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   308
--- ipython-0.10/docs/examples/kernel/task_profiler.py	2009-04-16 08:58:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   309
+++ ipython-0.10-mod/docs/examples/kernel/task_profiler.py	2009-12-03 18:30:49.306568000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   310
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   311
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   312
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   313
 """Test the performance of the task farming system.
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   314
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   315
 This script submits a set of tasks to the TaskClient.  The tasks
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   316
diff -u -r ipython-0.10/docs/examples/kernel/taskreject.py ipython-0.10-mod/docs/examples/kernel/taskreject.py
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   317
--- ipython-0.10/docs/examples/kernel/taskreject.py	2009-07-31 09:20:05.000000000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   318
+++ ipython-0.10-mod/docs/examples/kernel/taskreject.py	2009-12-03 18:31:00.062992000 +0800
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   319
@@ -1,4 +1,4 @@
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   320
-#!/usr/bin/env python
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   321
+#!/usr/bin/python2.6
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   322
 # encoding: utf-8
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   323
 
93a24ff5a6bd 2009-12-03 Li Yuan <[email protected]>
liyuan
parents: 17091
diff changeset
   324
 """