summaryrefslogtreecommitdiff
path: root/grc/gui/external_editor.py
diff options
context:
space:
mode:
authorSeth Hitefield <sdh11@vt.edu>2015-11-13 18:51:04 -0500
committerSebastian Koslowski <koslowski@kit.edu>2015-11-24 17:01:31 +0100
commitba57cd0c5e7352c81e5025760d7aaecde92d083b (patch)
tree7ad66399e7268628c4586ecf513b4802ef6a9c2b /grc/gui/external_editor.py
parent461152d46e6db790e37b09bd3b92035b62d7091f (diff)
grc: Added option to use the default editor when opening embedded python blocks
Diffstat (limited to 'grc/gui/external_editor.py')
-rw-r--r--grc/gui/external_editor.py20
1 files changed, 8 insertions, 12 deletions
diff --git a/grc/gui/external_editor.py b/grc/gui/external_editor.py
index 3322556ce7..76f21412b0 100644
--- a/grc/gui/external_editor.py
+++ b/grc/gui/external_editor.py
@@ -24,16 +24,15 @@ import threading
import tempfile
import subprocess
-import Constants
-
class ExternalEditor(threading.Thread):
- def __init__(self, name, value, callback):
+ def __init__(self, editor, name, value, callback):
threading.Thread.__init__(self)
self.daemon = True
self._stop_event = threading.Event()
+ self.editor = editor
self.callback = callback
self.tempfile = self._create_tempfile(name, value)
@@ -49,9 +48,7 @@ class ExternalEditor(threading.Thread):
return self.tempfile.name
def open_editor(self):
- proc = subprocess.Popen(
- args=(Constants.EDITOR, self.filename)
- )
+ proc = subprocess.Popen(args=(self.editor, self.filename))
proc.poll()
return proc
@@ -84,10 +81,9 @@ if __name__ == '__main__':
def p(data):
print data
- Constants.EDITOR = '/usr/bin/gedit'
- editor = ExternalEditor("test", "content", p)
- editor.open_editor()
- editor.start()
+ e = ExternalEditor('/usr/bin/gedit', "test", "content", p)
+ e.open_editor()
+ e.start()
time.sleep(15)
- editor.stop()
- editor.join()
+ e.stop()
+ e.join()