run python 2to3
This commit is contained in:
parent
19f5455eb2
commit
e7212ab6af
|
@ -194,8 +194,8 @@ class jackctl_g15:
|
||||||
status_line += " started in non-realtime mode"
|
status_line += " started in non-realtime mode"
|
||||||
else:
|
else:
|
||||||
status_line += " stopped"
|
status_line += " stopped"
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
print repr(e)
|
print(repr(e))
|
||||||
status_line = "JACK cannot be connected"
|
status_line = "JACK cannot be connected"
|
||||||
if self.jack:
|
if self.jack:
|
||||||
self.g15.clear(False)
|
self.g15.clear(False)
|
||||||
|
|
10
bin/ladiconf
10
bin/ladiconf
|
@ -41,16 +41,16 @@ def check_ladish():
|
||||||
try:
|
try:
|
||||||
proxy = laditools.ladish_proxy()
|
proxy = laditools.ladish_proxy()
|
||||||
except:
|
except:
|
||||||
print "ladish proxy creation failed"
|
print("ladish proxy creation failed")
|
||||||
return
|
return
|
||||||
|
|
||||||
if not proxy.is_available():
|
if not proxy.is_available():
|
||||||
print "ladish is not available"
|
print("ladish is not available")
|
||||||
return
|
return
|
||||||
|
|
||||||
if proxy.studio_is_loaded():
|
if proxy.studio_is_loaded():
|
||||||
if not proxy.studio_is_started():
|
if not proxy.studio_is_started():
|
||||||
print "ladish studio is loaded and not started"
|
print("ladish studio is loaded and not started")
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
msg = "JACK can only be configured with a stopped studio. Please stop your studio first."
|
msg = "JACK can only be configured with a stopped studio. Please stop your studio first."
|
||||||
|
@ -240,7 +240,7 @@ class cell_renderer_param(gtk.GenericCellRenderer):
|
||||||
else:
|
else:
|
||||||
self.set_property('mode', gtk.CELL_RENDERER_MODE_EDITABLE)
|
self.set_property('mode', gtk.CELL_RENDERER_MODE_EDITABLE)
|
||||||
else:
|
else:
|
||||||
print pspec.name
|
print(pspec.name)
|
||||||
setattr(self, pspec.name, value)
|
setattr(self, pspec.name, value)
|
||||||
|
|
||||||
def do_get_property(self, pspec):
|
def do_get_property(self, pspec):
|
||||||
|
@ -335,7 +335,7 @@ class cell_renderer_param(gtk.GenericCellRenderer):
|
||||||
if typechar == 'u' or typechar == 'i':
|
if typechar == 'u' or typechar == 'i':
|
||||||
try:
|
try:
|
||||||
value = int(value_str)
|
value = int(value_str)
|
||||||
except ValueError, e:
|
except ValueError as e:
|
||||||
# Hide the widget (because it may display something else than what user typed in)
|
# Hide the widget (because it may display something else than what user typed in)
|
||||||
widget.hide()
|
widget.hide()
|
||||||
# Display the error
|
# Display the error
|
||||||
|
|
12
bin/ladilog
12
bin/ladilog
|
@ -43,7 +43,7 @@ try:
|
||||||
pygtk.require ('2.0')
|
pygtk.require ('2.0')
|
||||||
import gtk
|
import gtk
|
||||||
import vte
|
import vte
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("You need to get you dependencies right before you run this program. Ask your package maintainer why this is happening to you\n%s") % repr(e))
|
error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("You need to get you dependencies right before you run this program. Ask your package maintainer why this is happening to you\n%s") % repr(e))
|
||||||
error.run ()
|
error.run ()
|
||||||
exit (1)
|
exit (1)
|
||||||
|
@ -113,9 +113,9 @@ class ladilog(object):
|
||||||
# skip logfiles that dont exist
|
# skip logfiles that dont exist
|
||||||
if not os.access(log['logfile_path'], os.R_OK):
|
if not os.access(log['logfile_path'], os.R_OK):
|
||||||
self.log_files.remove(log)
|
self.log_files.remove(log)
|
||||||
print _("Skipping '%s' because it does not exist") % log['logfile_path']
|
print(_("Skipping '%s' because it does not exist") % log['logfile_path'])
|
||||||
else:
|
else:
|
||||||
print _("Watching '%s'") % log['logfile_path']
|
print(_("Watching '%s'") % log['logfile_path'])
|
||||||
|
|
||||||
max_lines_text = self.param_dict['max_lines']
|
max_lines_text = self.param_dict['max_lines']
|
||||||
self.max_lines = int (max_lines_text)
|
self.max_lines = int (max_lines_text)
|
||||||
|
@ -149,9 +149,9 @@ class ladilog(object):
|
||||||
log["term"].feed(line)
|
log["term"].feed(line)
|
||||||
|
|
||||||
except ValueError:
|
except ValueError:
|
||||||
print _("You called Popen with invalid arguments... dumbass")
|
print(_("You called Popen with invalid arguments... dumbass"))
|
||||||
except:
|
except:
|
||||||
print _("Unexpected error:"), sys.exc_info ()[0]
|
print(_("Unexpected error:"), sys.exc_info ()[0])
|
||||||
|
|
||||||
for log in self.log_files:
|
for log in self.log_files:
|
||||||
self.logview_notebook.append_page (log["term"])
|
self.logview_notebook.append_page (log["term"])
|
||||||
|
@ -191,7 +191,7 @@ class ladilog(object):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
ladilog().run()
|
ladilog().run()
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
error = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("Unexpected error\n\n") + repr(e))
|
error = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("Unexpected error\n\n") + repr(e))
|
||||||
error.run()
|
error.run()
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
|
@ -107,7 +107,7 @@ class laditray (gtk.StatusIcon, laditools.manager):
|
||||||
self.set_tooltip_safe ("JACK is stopped")
|
self.set_tooltip_safe ("JACK is stopped")
|
||||||
self.set_icon ("stopped")
|
self.set_icon ("stopped")
|
||||||
self.clear_diagnose_text()
|
self.clear_diagnose_text()
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
self.set_tooltip_safe ("JACK is sick")
|
self.set_tooltip_safe ("JACK is sick")
|
||||||
self.set_diagnose_text(repr(e))
|
self.set_diagnose_text(repr(e))
|
||||||
self.set_icon ("stopped")
|
self.set_icon ("stopped")
|
||||||
|
|
|
@ -144,10 +144,10 @@ class wmladi (wmoo.Application, laditools.manager):
|
||||||
self.clear_line(5)
|
self.clear_line(5)
|
||||||
self.started = False
|
self.started = False
|
||||||
self.clear_diagnose_text()
|
self.clear_diagnose_text()
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
self.set_diagnose_text(repr(e))
|
self.set_diagnose_text(repr(e))
|
||||||
if debug:
|
if debug:
|
||||||
print repr (e)
|
print(repr (e))
|
||||||
self.set_line(0, "JACK")
|
self.set_line(0, "JACK")
|
||||||
self.set_line(1, "is sick")
|
self.set_line(1, "is sick")
|
||||||
self.clear_line(2)
|
self.clear_line(2)
|
||||||
|
|
|
@ -292,7 +292,7 @@ class TreeViewTooltips:
|
||||||
def get_tooltip(self, view, column, path):
|
def get_tooltip(self, view, column, path):
|
||||||
'See the module doc string for a description of this method'
|
'See the module doc string for a description of this method'
|
||||||
|
|
||||||
raise NotImplemented, 'Subclass must implement get_tooltip()'
|
raise NotImplemented('Subclass must implement get_tooltip()')
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from jack_controller import jack_controller
|
from .jack_controller import jack_controller
|
||||||
from jack_configure import jack_configure
|
from .jack_configure import jack_configure
|
||||||
from ladimenu import manager, find_data_file
|
from .ladimenu import manager, find_data_file
|
||||||
from a2j_controller import a2j_controller
|
from .a2j_controller import a2j_controller
|
||||||
from a2j_menu import a2j_menu
|
from .a2j_menu import a2j_menu
|
||||||
from ladish_controller import ladish_proxy
|
from .ladish_controller import ladish_proxy
|
||||||
# from error import error
|
# from error import error
|
||||||
from config import config
|
from .config import config
|
||||||
from TreeViewTooltips import TreeViewTooltips
|
from .TreeViewTooltips import TreeViewTooltips
|
||||||
|
|
|
@ -31,7 +31,7 @@ class a2j_controller:
|
||||||
try:
|
try:
|
||||||
self.iface.is_started()
|
self.iface.is_started()
|
||||||
return True
|
return True
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
#print repr(e)
|
#print repr(e)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ from xdg import BaseDirectory as basedir
|
||||||
config_dir = path.join(basedir.xdg_config_home, 'laditools')
|
config_dir = path.join(basedir.xdg_config_home, 'laditools')
|
||||||
config_filename = path.join(config_dir, 'laditools.conf')
|
config_filename = path.join(config_dir, 'laditools.conf')
|
||||||
if not exists (config_dir):
|
if not exists (config_dir):
|
||||||
mkdir (config_dir, 0755)
|
mkdir (config_dir, 0o755)
|
||||||
|
|
||||||
# Note to users of the config class. Only applications should create an instance
|
# Note to users of the config class. Only applications should create an instance
|
||||||
# of the config object. The ladimenu is *NOT* an application...
|
# of the config object. The ladimenu is *NOT* an application...
|
||||||
|
|
|
@ -42,7 +42,7 @@ class jack_configure:
|
||||||
# self.bus.add_signal_receiver (self.name_owner_changed, dbus_interface = controller_interface_name, signal_name = "NameOwnerChanged")
|
# self.bus.add_signal_receiver (self.name_owner_changed, dbus_interface = controller_interface_name, signal_name = "NameOwnerChanged")
|
||||||
|
|
||||||
def name_owner_changed (name = None, old_owner = None, new_owner = None):
|
def name_owner_changed (name = None, old_owner = None, new_owner = None):
|
||||||
print "Name changed : %r" % name
|
print("Name changed : %r" % name)
|
||||||
|
|
||||||
def get_selected_driver (self):
|
def get_selected_driver (self):
|
||||||
isset, default, value = self.iface.GetParameterValue (['engine', 'driver'])
|
isset, default, value = self.iface.GetParameterValue (['engine', 'driver'])
|
||||||
|
|
|
@ -23,11 +23,11 @@ pygtk.require('2.0')
|
||||||
import gtk
|
import gtk
|
||||||
import gobject
|
import gobject
|
||||||
import subprocess
|
import subprocess
|
||||||
from config import config
|
from .config import config
|
||||||
from jack_configure import jack_configure
|
from .jack_configure import jack_configure
|
||||||
from jack_controller import jack_controller
|
from .jack_controller import jack_controller
|
||||||
from a2j_controller import a2j_controller
|
from .a2j_controller import a2j_controller
|
||||||
from ladish_controller import ladish_proxy
|
from .ladish_controller import ladish_proxy
|
||||||
|
|
||||||
# Default launcher menu :
|
# Default launcher menu :
|
||||||
menu_default = [{"Configure": "ladiconf"},
|
menu_default = [{"Configure": "ladiconf"},
|
||||||
|
@ -239,7 +239,7 @@ class manager:
|
||||||
def on_menu_command(self, widget, function):
|
def on_menu_command(self, widget, function):
|
||||||
try:
|
try:
|
||||||
function()
|
function()
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
error = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, "Error executing " + repr(function) + "Unexpected error\n\n" + repr(e))
|
error = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, "Error executing " + repr(function) + "Unexpected error\n\n" + repr(e))
|
||||||
error.run()
|
error.run()
|
||||||
error.destroy()
|
error.destroy()
|
||||||
|
@ -259,8 +259,8 @@ class manager:
|
||||||
item.show()
|
item.show()
|
||||||
menu.append(item)
|
menu.append(item)
|
||||||
item.connect("button-release-event", function, studio) # "activate" is not used because of focus bug in pygtk
|
item.connect("button-release-event", function, studio) # "activate" is not used because of focus bug in pygtk
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
print e
|
print(e)
|
||||||
self.menu_clear(menu)
|
self.menu_clear(menu)
|
||||||
item = gtk.MenuItem("Error obtaining studio list")
|
item = gtk.MenuItem("Error obtaining studio list")
|
||||||
item.set_sensitive(False)
|
item.set_sensitive(False)
|
||||||
|
@ -284,8 +284,8 @@ class manager:
|
||||||
|
|
||||||
# Add the laucher entries at the beginning of the menu
|
# Add the laucher entries at the beginning of the menu
|
||||||
for items in self.menu_array:
|
for items in self.menu_array:
|
||||||
menu_label = items.keys()[0] + "..."
|
menu_label = list(items.keys())[0] + "..."
|
||||||
path = items.values()[0]
|
path = list(items.values())[0]
|
||||||
menu_items.append((gtk.ImageMenuItem(menu_label), self.on_menu_launcher, path))
|
menu_items.append((gtk.ImageMenuItem(menu_label), self.on_menu_launcher, path))
|
||||||
|
|
||||||
menu = gtk.Menu()
|
menu = gtk.Menu()
|
||||||
|
|
|
@ -36,7 +36,7 @@ class ladish_proxy:
|
||||||
try:
|
try:
|
||||||
self.control_iface.IsStudioLoaded()
|
self.control_iface.IsStudioLoaded()
|
||||||
return True
|
return True
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
#print repr(e)
|
#print repr(e)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue