@@ -14,16 +14,9 @@ sys.path.append(os.environ['TM_BUNDLE_SUPPORT'] + '/lib') from ipythonMate import notify_with_growl import ipythonClient as client -connected = client.find_server_then_connect() - # Only notify if there was a problem. -if not connected: +if not client.find_server_then_connect('%whos'): notify_with_growl("IPython Script", 'Failed to connect to IPython session') -else: - client.send('%whos') - client.disconnect() - - </string> <key>input</key> <string>none</string> Commands/Print variables (detailed) (using server).tmCommand @@ -14,15 +14,9 @@ sys.path.append(os.environ['TM_BUNDLE_SUPPORT'] + '/lib') from ipythonMate import notify_with_growl import ipythonClient as client -connected = client.find_server_then_connect() - # Only notify if there was a problem. -if not connected: +if not client.find_server_then_connect('%who'): notify_with_growl("IPython Script", 'Failed to connect to IPython session') -else: - client.send('%who') - client.disconnect() - </string> <key>input</key> Commands/Print variables (using server).tmCommand @@ -27,9 +27,8 @@ except KeyError: text='%run ' + run_options + '-p ' + prun_options + ' ' + os.environ.get('TM_FILEPATH') -if client.find_server_then_connect(): - client.send(text) - client.disconnect() +# Only notify if there was a problem. +if client.find_server_then_connect(text): notify_with_growl("IPython Script", 'Ran ' + os.path.basename(os.environ.get('TM_FILEPATH')) + ' through profiler') else: notify_with_growl("IPython Script", 'Failed to connect to IPython session')</string> Commands/Run file through profiler (using server).tmCommand @@ -28,14 +28,10 @@ if not text: connected = False else: text = '%prun ' + prun_options + text - connected = client.find_server_then_connect() # Only notify if there was a problem. -if not connected: - notify_with_growl("IPython Script", 'Failed to connect to IPython session') -else: - client.send(text) - client.disconnect()</string> +if not client.find_server_then_connect(text): + notify_with_growl("IPython Script", 'Failed to connect to IPython session')</string> <key>input</key> <string>none</string> <key>keyEquivalent</key> Commands/Run selection : line through profiler (using server).tmCommand @@ -205,7 +205,6 @@ <string>59D7CA34-7681-43E5-8964-53F132110218</string> <string>2E8EFEC2-BDBF-4465-9290-0760BEC3F10D</string> <string>428FDB39-B08D-42DB-BBB5-02988C7EFBF9</string> - <string>112295B4-E6F7-4326-961B-5A4CE333F437</string> <string>280E16F1-814E-4B3A-BB65-97F3F4B71670</string> <string>842C84A4-49F2-4114-BAFF-D1D128F3AC9B</string> <string>F1780FD5-29EA-44FC-A8FA-95914849493E</string> info.plist Commands/Help on current word.tmCommand d0cb5e7e9478926bf9c9bfdd61512f2f1ccdb529 Matt Foster matt.p.foster@gmail.com http://github.com/mattfoster/ipython-tmbundle/commit/14cd44cf8a568b0ac4d8832938d391fe542e231a 14cd44cf8a568b0ac4d8832938d391fe542e231a 2008-12-09T13:38:17-08:00 2008-12-09T13:38:17-08:00 Converted more commands to use twisted client bc2edcdc4cc0dfeaf597213c6d2261da2a944203 Matt Foster matt.p.foster@gmail.com