Hello community, here is the log from the commit of package d-feet for openSUSE:Factory checked in at 2013-03-12 17:11:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/d-feet (Old) and /work/SRC/openSUSE:Factory/.d-feet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "d-feet", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/d-feet/d-feet.changes 2013-01-08 13:35:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.d-feet.new/d-feet.changes 2013-03-12 17:11:23.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Jan 25 12:47:24 UTC 2013 - [email protected] + +- Update to version 0.3.3: + + Don't close dialog after method execution. + + Add close-button to exception dialog. + + Fix needed double click to close method execution dialog. + + Update HACKING. +- Changes from version 0.3.2: + + Fix input parameter handling for method execution dialog. + + Update requirements in README. + + Make d-feet ready for Python 3. + +------------------------------------------------------------------- Old: ---- d-feet-0.3.1.tar.xz New: ---- d-feet-0.3.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ d-feet.spec ++++++ --- /var/tmp/diff_new_pack.ix3rn9/_old 2013-03-12 17:11:25.000000000 +0100 +++ /var/tmp/diff_new_pack.ix3rn9/_new 2013-03-12 17:11:25.000000000 +0100 @@ -17,7 +17,7 @@ Name: d-feet -Version: 0.3.1 +Version: 0.3.3 Release: 0 License: GPL-2.0+ Summary: Graphical D-Bus Debugger ++++++ d-feet-0.3.1.tar.xz -> d-feet-0.3.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/NEWS new/d-feet-0.3.3/NEWS --- old/d-feet-0.3.1/NEWS 2012-10-23 09:43:55.000000000 +0200 +++ new/d-feet-0.3.3/NEWS 2013-01-12 10:04:56.000000000 +0100 @@ -1,3 +1,18 @@ +0.3.3 - Jan 12, 2013 +==================== + +- Don't close dialog after method execution (Thomas Bechtold) +- Add close-button to exception dialog (Thomas Bechtold) +- Fix needed double click to close method execution dialog (Thomas Bechtold) +- Update HACKING (Thomas Bechtold) + +0.3.2 - Jan 10, 2013 +==================== + +- Fix input parameter handling for method execution dialog (Thomas Bechtold) +- Update requirements in README (Thomas Bechtold) +- Make d-feet ready for Python 3 (Thomas Bechtold) + 0.3.1 - Oct 23, 2012 ==================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/PKG-INFO new/d-feet-0.3.3/PKG-INFO --- old/d-feet-0.3.1/PKG-INFO 2012-10-23 09:49:52.000000000 +0200 +++ new/d-feet-0.3.3/PKG-INFO 2013-01-12 10:06:18.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: d-feet -Version: 0.3.1 +Version: 0.3.3 Summary: D-Bus debugger Home-page: https://live.gnome.org/DFeet/ Author: Thomas Bechtold diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/README new/d-feet-0.3.3/README --- old/d-feet-0.3.1/README 2012-10-16 00:34:35.000000000 +0200 +++ new/d-feet-0.3.3/README 2012-11-22 18:27:52.000000000 +0100 @@ -1,11 +1,10 @@ -Welcome to D-Feet (http://live.gnome.org/d-feet) +Welcome to D-Feet (https://live.gnome.org/DFeet/) Requirements: python >= 2.7 -glib >= 2.34 -gobject-introspection -python-gi +python-gi >= 3.3.91 +gtk >= 3.6 Optional Requriements: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/d-feet new/d-feet-0.3.3/d-feet --- old/d-feet-0.3.1/d-feet 2012-10-23 08:13:40.000000000 +0200 +++ new/d-feet-0.3.3/d-feet 2012-11-11 09:59:45.000000000 +0100 @@ -40,7 +40,7 @@ } #must set variables before importing Globals because it requires them -for var, path in ENV_PATHS.iteritems(): +for var, path in ENV_PATHS.items(): #if it is not already set, set the enviroment variable. os.environ.setdefault(var, path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/d_feet.egg-info/PKG-INFO new/d-feet-0.3.3/d_feet.egg-info/PKG-INFO --- old/d-feet-0.3.1/d_feet.egg-info/PKG-INFO 2012-10-23 09:49:52.000000000 +0200 +++ new/d-feet-0.3.3/d_feet.egg-info/PKG-INFO 2013-01-12 10:06:18.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: d-feet -Version: 0.3.1 +Version: 0.3.3 Summary: D-Bus debugger Home-page: https://live.gnome.org/DFeet/ Author: Thomas Bechtold diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/dfeet/DFeetApp.py new/d-feet-0.3.3/dfeet/DFeetApp.py --- old/d-feet-0.3.1/dfeet/DFeetApp.py 2012-10-23 08:10:20.000000000 +0200 +++ new/d-feet-0.3.3/dfeet/DFeetApp.py 2012-11-11 09:59:45.000000000 +0100 @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- -from gi.repository import Gtk, Gio, GObject +from __future__ import print_function +from gi.repository import Gtk, Gio, GObject -from bus_watch import BusWatch -from settings import Settings -from _ui.uiloader import UILoader -from _ui.addconnectiondialog import AddConnectionDialog -from _ui.executemethoddialog import ExecuteMethodDialog +from dfeet.bus_watch import BusWatch +from dfeet.settings import Settings +from dfeet._ui.uiloader import UILoader +from dfeet._ui.addconnectiondialog import AddConnectionDialog +from dfeet._ui.executemethoddialog import ExecuteMethodDialog class NotebookTabLabel(Gtk.Box): @@ -126,7 +127,7 @@ if (len(self.bus_history) > self.HISTORY_MAX_SIZE): self.bus_history = self.bus_history[0:self.HISTORY_MAX_SIZE] except Exception as e: - print "can not connect to '%s': %s" % (address, str(e)) + print("can not connect to '%s': %s" % (address, str(e))) dialog.destroy() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/dfeet/_ui/addconnectiondialog.py new/d-feet-0.3.3/dfeet/_ui/addconnectiondialog.py --- old/d-feet-0.3.1/dfeet/_ui/addconnectiondialog.py 2012-10-16 00:34:35.000000000 +0200 +++ new/d-feet-0.3.3/dfeet/_ui/addconnectiondialog.py 2012-11-11 09:59:45.000000000 +0100 @@ -1,5 +1,6 @@ +# -*- coding: utf-8 -*- from gi.repository import Gtk, Gio -from uiloader import UILoader +from dfeet._ui.uiloader import UILoader class AddConnectionDialog: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/dfeet/_ui/executemethoddialog.py new/d-feet-0.3.3/dfeet/_ui/executemethoddialog.py --- old/d-feet-0.3.1/dfeet/_ui/executemethoddialog.py 2012-10-16 00:34:35.000000000 +0200 +++ new/d-feet-0.3.3/dfeet/_ui/executemethoddialog.py 2013-01-12 09:58:13.000000000 +0100 @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- import time from pprint import pformat -from gi.repository import GLib, Gio +from gi.repository import GLib, Gio, Gtk -from uiloader import UILoader +from dfeet._ui.uiloader import UILoader class ExecuteMethodDialog: @@ -13,6 +13,11 @@ 'execute_dialog_close_cb': self.close_cb } + self.connection = connection + self.connection_is_bus = connection_is_bus + self.bus_name = bus_name + self.method_obj = method_obj + ui = UILoader(UILoader.UI_EXECUTEDIALOG) self.dialog = ui.get_root_widget() self.label_method_name = ui.get_widget('label_method_name') @@ -27,12 +32,6 @@ self.label_min = ui.get_widget('label_min') self.label_max = ui.get_widget('label_max') ui.connect_signals(signal_dict) - - self.connection = connection - self.connection_is_bus = connection_is_bus - self.bus_name = bus_name - self.method_obj = method_obj - self.label_method_name.set_markup("%s" % (self.method_obj.markup_str)) self.label_object_path.set_markup("%s" % (self.method_obj.object_path)) self.label_interface.set_markup("%s" % (self.method_obj.iface_info.name)) @@ -55,8 +54,9 @@ try: #build a GVariant if params: - params = '(' + params + ',)' - params_gvariant = GLib.Variant.parse(None, params, None, None) + params = "(" + params + ",)" + params_code = '(' + self.method_obj.in_args_code + ')' + params_gvariant = GLib.Variant(params_code, eval(params)) else: params_gvariant = None @@ -112,7 +112,9 @@ self.prettyprint_textview.get_buffer().set_text(pformat(str(e))) def run(self): - self.dialog.run() + response =self.dialog.run() + if response == Gtk.ResponseType.DELETE_EVENT or response == Gtk.ResponseType.CLOSE: + self.dialog.destroy() def close_cb(self, widget): self.dialog.destroy() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/dfeet/bus_watch.py new/d-feet-0.3.3/dfeet/bus_watch.py --- old/d-feet-0.3.1/dfeet/bus_watch.py 2012-10-16 00:34:35.000000000 +0200 +++ new/d-feet-0.3.3/dfeet/bus_watch.py 2013-01-12 09:24:46.000000000 +0100 @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- +from __future__ import print_function from gi.repository import GObject, Gtk, Gio -from _ui.uiloader import UILoader -from introspection import AddressInfo + +from dfeet._ui.uiloader import UILoader +from dfeet.introspection import AddressInfo class DBusBusName(GObject.GObject): @@ -14,7 +16,7 @@ self.__cmdline = '' def __repr__(self): - return u"%s (pid: %s)" % (self.bus_name_unique, self.pid) + return "%s (pid: %s)" % (self.bus_name_unique, self.pid) def __update_cmdline(self): if self.pid > 0: @@ -144,7 +146,7 @@ error_handler = self.__get_unix_process_id_error_cb, user_data=bus_name_obj) #add bus to liststore - return self.liststore_model.append([bus_name_obj, 0, u"%s" % (bus_name_obj.bus_name_unique), bus_name_obj.cmdline]) + return self.liststore_model.append([bus_name_obj, 0, "%s" % (bus_name_obj.bus_name_unique), bus_name_obj.cmdline]) def __liststore_model_remove(self, bus_name_obj): @@ -189,7 +191,7 @@ def __list_names_error_handler(self, obj, error, userdata): - print "error getting bus names: %s" % str(error) + print("error getting bus names: %s" % str(error)) def __get_unix_process_id_cb(self, obj, pid, bus_name_obj): @@ -197,7 +199,7 @@ def __get_unix_process_id_error_cb(self, obj, error, bus_name_obj): - print "error getting unix process id for %s: %s" % (bus_name_obj.bus_name_unique, str(error)) + print("error getting unix process id for %s: %s" % (bus_name_obj.bus_name_unique, str(error))) bus_name_obj.pid = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/dfeet/dbus_utils.py new/d-feet-0.3.3/dfeet/dbus_utils.py --- old/d-feet-0.3.1/dfeet/dbus_utils.py 2012-10-16 00:34:35.000000000 +0200 +++ new/d-feet-0.3.3/dfeet/dbus_utils.py 2012-11-11 09:59:45.000000000 +0100 @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import print_function + def convert_complex_type(subsig): result = None len_consumed = 0 @@ -140,7 +142,7 @@ try: result += dbus_type except: - print type_list + print(type_list) return result[2:] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/dfeet/introspection.py new/d-feet-0.3.3/dfeet/introspection.py --- old/d-feet-0.3.1/dfeet/introspection.py 2012-10-16 00:34:35.000000000 +0200 +++ new/d-feet-0.3.3/dfeet/introspection.py 2013-01-12 09:25:12.000000000 +0100 @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- +from __future__ import print_function from gi.repository import Gtk, Gio, GLib -from _ui.executemethoddialog import ExecuteMethodDialog +from dfeet._ui.executemethoddialog import ExecuteMethodDialog -from _ui.uiloader import UILoader +from dfeet._ui.uiloader import UILoader -from introspection_helper import DBusNode, DBusInterface, DBusProperty, DBusSignal, DBusMethod +from dfeet.introspection_helper import DBusNode, DBusInterface, DBusProperty, DBusSignal, DBusMethod class AddressInfo(): @@ -43,10 +44,9 @@ self.__label_unique_name = ui.get_widget('label_unique_name') self.__label_address = ui.get_widget('label_address') self.__messagedialog = ui.get_widget('messagedialog') - + self.__messagedialog.connect("close", self.__messagedialog_close_cb) #connect signals ui.connect_signals(signal_dict) - if self.connection_is_bus: #we expect a bus connection if self.address == Gio.BusType.SYSTEM or self.address == Gio.BusType.SESSION: @@ -74,6 +74,9 @@ #start processing data self.introspect_start() + def __messagedialog_close_cb(self, dialog): + self.__messagedialog.destroy() + def __treeview_row_activated_cb(self, treeview, path, view_column): model = treeview.get_model() @@ -159,10 +162,10 @@ res = connection.call_finish(result_async) except Exception as e: #got an exception (eg dbus timeout). show the exception - print "Exception: '%s'" % (str(e)) self.__messagedialog.set_title("DBus Exception") self.__messagedialog.set_property("text", "%s : %s" % (self.name, str(e))) self.__messagedialog.run() + self.__messagedialog.destroy() else: #we got a valid result from dbus call! Create nodes and add to treemodel node_info = Gio.DBusNodeInfo.new_for_xml(res[0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/dfeet/introspection_helper.py new/d-feet-0.3.3/dfeet/introspection_helper.py --- old/d-feet-0.3.1/dfeet/introspection_helper.py 2012-10-16 00:34:35.000000000 +0200 +++ new/d-feet-0.3.3/dfeet/introspection_helper.py 2013-01-10 08:25:49.000000000 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from gi.repository import GObject, Gio -import dbus_utils +from dfeet import dbus_utils def args_signature_markup(arg_signature): @@ -21,7 +21,7 @@ self.__node_info = node_info # Gio.GDBusNodeInfo object def __repr__(self): - return u"Name: %s ; ObjPath: %s ; NodeInfo: %s" % (self.name, self.object_path, self.node_info) + return "Name: %s ; ObjPath: %s ; NodeInfo: %s" % (self.name, self.object_path, self.node_info) @property def name(self): @@ -43,7 +43,7 @@ self.__iface_info = iface_info # Gio.GDBusInterfaceInfo object def __repr__(self): - return u"iface '%s' on node '%s'" % (self.iface_info.name, self.node_info.path) + return "iface '%s' on node '%s'" % (self.iface_info.name, self.node_info.path) @property def iface_info(self): @@ -59,7 +59,7 @@ def __repr__(self): sig = dbus_utils.sig_to_string(self.property_info.signature) - return u"%s %s (%s)" % (sig, self.property_info.name, self.property_info.flags) + return "%s %s (%s)" % (sig, self.property_info.name, self.property_info.flags) @property def property_info(self): @@ -109,7 +109,7 @@ self.__signal_info = signal_info #Gio.GDBusSignalInfo object def __repr__(self): - return u"%s" % (self.signal_info.name) + return "%s" % (self.signal_info.name) @property def signal_info(self): @@ -143,7 +143,14 @@ self.__method_info = method_info #Gio.GDBusMethodInfo object def __repr__(self): - return u"%s(%s) ↦ %s (%s)" % (self.method_info.name, self.in_args_str, self.out_args_str, DBusInterface.__repr__(self)) + return "%s(%s) ↦ %s (%s)" % (self.method_info.name, self.in_args_str, self.out_args_str, DBusInterface.__repr__(self)) + + @property + def in_args_code(self): + in_args = "" + for a in self.__method_info.in_args: + in_args += a.signature + return in_args @property def method_info(self): @@ -151,7 +158,7 @@ @property def markup_str(self): - return u"%s %s <b>↦</b> %s" % (self.method_info.name, self.in_args_markup_str, self.out_args_markup_str) + return "%s %s <b>↦</b> %s" % (self.method_info.name, self.in_args_markup_str, self.out_args_markup_str) @property def in_args(self): @@ -171,7 +178,7 @@ @property def in_args_str(self): - result = u'' + result = "" for arg in self.in_args: result += "%s %s, " % (arg['signature'], arg['name']) @@ -179,7 +186,7 @@ @property def out_args_str(self): - result = u'' + result = "" for arg in self.out_args: result += "%s %s, " % (arg['signature'], arg['name']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/dfeet/settings.py new/d-feet-0.3.3/dfeet/settings.py --- old/d-feet-0.3.1/dfeet/settings.py 2012-10-16 00:34:35.000000000 +0200 +++ new/d-feet-0.3.3/dfeet/settings.py 2012-11-11 09:59:45.000000000 +0100 @@ -4,8 +4,12 @@ # # portions taken from the Jokosher project # - -import ConfigParser +try: + #python2.x + import ConfigParser as configparser +except: + #python3 + import configparser import os import re @@ -74,6 +78,10 @@ return self def next(self): + """for python2""" + return self.__next__() + + def __next__(self): for r in self._parse_order: m = r.match(self._consumable) if m: @@ -107,13 +115,13 @@ If None, the default $XDG_CONFIG_HOME/d-feet/config will be used. """ if not filename: - if os.environ.has_key('XDG_CONFIG_HOME'): + if 'XDG_CONFIG_HOME' in list(os.environ.keys()): self.filename = os.path.join(os.environ['XDG_CONFIG_HOME'], 'd-feet', 'config') else: self.filename = os.path.join(os.environ['HOME'], '.config', 'd-feet', 'config') else: self.filename = filename - self.config = ConfigParser.ConfigParser() + self.config = configparser.ConfigParser() self.read() @@ -128,7 +136,7 @@ def decode_list(self, s): result = [] - lex = ConfigTokenizer(s); + lex = ConfigTokenizer(s) for item in lex: if item.is_value(): result.append(str(item)) @@ -169,7 +177,7 @@ if self.general[key] == None: self.general[key] = '' - self.config.set("General", key, self.general[key]) + self.config.set("General", str(key), str(self.general[key])) # make sure that the directory that the config file is in exists new_file_dir = os.path.split(self.filename)[0] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/setup.py new/d-feet-0.3.3/setup.py --- old/d-feet-0.3.1/setup.py 2012-10-23 09:44:06.000000000 +0200 +++ new/d-feet-0.3.3/setup.py 2013-01-12 09:01:45.000000000 +0100 @@ -10,7 +10,7 @@ import os import glob -DFEET_VERSION='0.3.1' +DFEET_VERSION='0.3.3' #Create an array with all the locale filenames I18NFILES = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/d-feet-0.3.1/ui/introspection.ui new/d-feet-0.3.3/ui/introspection.ui --- old/d-feet-0.3.1/ui/introspection.ui 2012-10-23 07:26:25.000000000 +0200 +++ new/d-feet-0.3.3/ui/introspection.ui 2013-01-12 09:24:14.000000000 +0100 @@ -196,13 +196,14 @@ <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="message_type">error</property> + <property name="buttons">close</property> <child internal-child="vbox"> <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> - <object class="GtkButtonBox" id="messagedialog-action_area2"> + <object class="GtkButtonBox" id="messagedialog-action_area"> <property name="can_focus">False</property> </object> <packing> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
