[d-feet/pygi] Code cleanup (make pyflakes and pychecker happy)
- From: Thomas Bechtold <toabctl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [d-feet/pygi] Code cleanup (make pyflakes and pychecker happy)
- Date: Mon, 15 Oct 2012 15:47:27 +0000 (UTC)
commit 6cdaf6415aea9d5bf4d244c9e66e218cf7502444
Author: Thomas Bechtold <thomasbechtold jpberlin de>
Date: Sat Oct 13 09:36:25 2012 +0200
Code cleanup (make pyflakes and pychecker happy)
dfeet/DFeetApp.py | 11 ++-
dfeet/_ui/busnameinfobox.py | 157 --------------------------------------
dfeet/_ui/executemethoddialog.py | 2 +-
dfeet/_ui/uiloader.py | 4 +-
dfeet/bus_watch.py | 13 ++--
dfeet/dbus_utils.py | 20 +++---
dfeet/introspection.py | 40 +++-------
dfeet/introspection_helper.py | 2 +-
dfeet/settings.py | 6 +-
tests/tests.py | 1 -
ui/introspection.ui | 1 -
11 files changed, 41 insertions(+), 216 deletions(-)
---
diff --git a/dfeet/DFeetApp.py b/dfeet/DFeetApp.py
index 426fb46..9f5f863 100644
--- a/dfeet/DFeetApp.py
+++ b/dfeet/DFeetApp.py
@@ -1,12 +1,8 @@
# -*- coding: utf-8 -*-
-import os
-import sys
-
from gi.repository import Gtk, Gio, GObject
from bus_watch import BusWatch
-from introspection import AddressInfo
from settings import Settings
from _ui.uiloader import UILoader
from _ui.addconnectiondialog import AddConnectionDialog
@@ -37,7 +33,7 @@ class NotebookTabLabel(Gtk.Box):
self.emit("close-clicked")
-class DFeetApp:
+class DFeetApp(object):
HISTORY_MAX_SIZE = 10
@@ -77,6 +73,11 @@ class DFeetApp:
return self.__bus_history
+ @bus_history.setter
+ def bus_history(self, history_new):
+ self.__bus_history = history_new
+
+
def __systembus_connect_cb(self, action):
"""connect to system bus"""
bw = BusWatch(Gio.BusType.SYSTEM)
diff --git a/dfeet/_ui/executemethoddialog.py b/dfeet/_ui/executemethoddialog.py
index 48c8eaf..c80aab7 100644
--- a/dfeet/_ui/executemethoddialog.py
+++ b/dfeet/_ui/executemethoddialog.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import time
from pprint import pformat
-from gi.repository import Gtk, GLib, Gio
+from gi.repository import GLib, Gio
from uiloader import UILoader
diff --git a/dfeet/_ui/uiloader.py b/dfeet/_ui/uiloader.py
index 2a38875..484626e 100644
--- a/dfeet/_ui/uiloader.py
+++ b/dfeet/_ui/uiloader.py
@@ -33,8 +33,8 @@ class UILoader:
self.ui = Gtk.Builder()
#load ui files
- for file in ui_info[0]:
- self.ui.add_from_file(self.ui_dir + '/' + file)
+ for f in ui_info[0]:
+ self.ui.add_from_file(self.ui_dir + '/' + f)
self.root_widget_name = ui_info[1]
diff --git a/dfeet/bus_watch.py b/dfeet/bus_watch.py
index 3b1c12a..7a4c248 100644
--- a/dfeet/bus_watch.py
+++ b/dfeet/bus_watch.py
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
-import os
-from gi.repository import GObject, GdkPixbuf, Gtk, Gio, GLib
+from gi.repository import GObject, Gtk, Gio
from _ui.uiloader import UILoader
from introspection import AddressInfo
@@ -38,7 +37,7 @@ class DBusBusName(GObject.GObject):
self.__pid = pid_new
try:
self.__update_cmdline()
- except Exception as e:
+ except:
self.__cmdline = ''
@property
@@ -76,7 +75,7 @@ class BusWatch(object):
#setup the conection
if self.address == Gio.BusType.SYSTEM or self.address == Gio.BusType.SESSION:
self.connection = Gio.bus_get_sync(self.address, None)
- elif Gio.dbus_is_supported_address(self.address) == True:
+ elif Gio.dbus_is_supported_address(self.address):
self.connection = Gio.DBusConnection.new_for_address_sync(self.address,
Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT | Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION,
None, None)
@@ -112,11 +111,11 @@ class BusWatch(object):
"""do something when a row is selected"""
selection = self.treeview.get_selection()
if selection:
- model, iter = selection.get_selected()
- if not iter:
+ model, iter_ = selection.get_selected()
+ if not iter_:
return
- bus_name_obj = model.get(iter, 0)[0]
+ bus_name_obj = model.get(iter_, 0)[0]
#remove current child
c2 = self.paned_buswatch.get_child2()
if c2:
diff --git a/dfeet/dbus_utils.py b/dfeet/dbus_utils.py
index fa38ba5..8dcd541 100644
--- a/dfeet/dbus_utils.py
+++ b/dfeet/dbus_utils.py
@@ -104,19 +104,19 @@ def sig_to_type_list(sig):
sig_len = len(sig)
while i < sig_len:
c = sig[i]
- type = convert_simple_type(c)
- if not type:
- (type, len_consumed) = convert_complex_type(sig[i:])
- if not type:
- type = 'Error(' + c + ')'
+ type_ = convert_simple_type(c)
+ if not type_:
+ (type_, len_consumed) = convert_complex_type(sig[i:])
+ if not type_:
+ type_ = 'Error(' + c + ')'
i += len_consumed
- if isinstance(type, list):
- for item in type:
+ if isinstance(type_, list):
+ for item in type_:
result.append(item)
else:
- result.append(type)
+ result.append(type_)
i+=1
@@ -145,10 +145,10 @@ def type_list_to_string(type_list):
return result[2:]
def sig_to_markup(sig, span_attr_str):
- list = sig_to_type_list(sig)
+ list_ = sig_to_type_list(sig)
markedup_list = []
m = '<span ' + span_attr_str + '>'
- m += type_list_to_string(list)
+ m += type_list_to_string(list_)
m += '</span>'
return m
diff --git a/dfeet/introspection.py b/dfeet/introspection.py
index d324ff3..1abb8cf 100644
--- a/dfeet/introspection.py
+++ b/dfeet/introspection.py
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
-from gi.repository import GObject, Gdk, GdkPixbuf, Gtk, Gio, Pango, GLib
-import dbus_utils
+from gi.repository import Gtk, Gio, GLib
from _ui.executemethoddialog import ExecuteMethodDialog
-import time
from _ui.uiloader import UILoader
@@ -23,7 +21,6 @@ class AddressInfo():
def __init__(self, address, name, connection_is_bus=True):
signal_dict = {
- 'treeview_cursor_changed_cb' : self.__treeview_cursor_changed_cb,
'treeview_row_activated_cb' : self.__treeview_row_activated_cb,
'treeview_row_expanded_cb' : self.__treeview_row_expanded_cb,
'button_reload_clicked_cb' : self.__button_reload_clicked_cb,
@@ -47,7 +44,6 @@ class AddressInfo():
self.__label_unique_name = ui.get_widget('label_unique_name')
self.__label_address = ui.get_widget('label_address')
self.__messagedialog = ui.get_widget('messagedialog')
- button_reload = ui.get_widget('button_reload')
#connect signals
ui.connect_signals(signal_dict)
@@ -57,45 +53,34 @@ class AddressInfo():
if self.address == Gio.BusType.SYSTEM or self.address == Gio.BusType.SESSION:
self.connection = Gio.bus_get_sync(self.address, None)
self.__label_address.set_text(Gio.dbus_address_get_for_bus_sync(self.address, None))
- elif Gio.dbus_is_supported_address(self.address) == True:
+ elif Gio.dbus_is_supported_address(self.address):
self.connection = Gio.DBusConnection.new_for_address_sync(self.address,
Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT | Gio.DBusConnectionFlags.MESSAGE_BUS_CONNECTION,
None, None)
self.__label_address.set_text(self.address)
else:
self.connection = None
- raise Exception("Invalid bus address '%'" % (self.address))
+ raise Exception("Invalid bus address '%s'" % (self.address))
else:
#we have a peer-to-peer connection
- if Gio.dbus_is_supported_address(self.address) == True:
+ if Gio.dbus_is_supported_address(self.address):
self.connection = Gio.DBusConnection.new_for_address_sync(self.address,
Gio.DBusConnectionFlags.AUTHENTICATION_CLIENT,
None, None)
self.__label_address.set_text(self.address)
else:
self.connection = None
- raise Exception("Invalid p2p address '%'" % (self.address))
+ raise Exception("Invalid p2p address '%s'" % (self.address))
#start processing data
self.introspect_start()
- def __treeview_cursor_changed_cb(self, treeview):
- """do something when a row is selected"""
- selection = self.__treeview.get_selection()
- if selection:
- model, iter = selection.get_selected()
- if not iter:
- return
-
- node_obj = model.get(iter, 1)[0]
-
-
def __treeview_row_activated_cb(self, treeview, path, view_column):
model = treeview.get_model()
- iter = model.get_iter(path)
+ iter_ = model.get_iter(path)
- obj = model.get_value(iter, 1)
+ obj = model.get_value(iter_, 1)
if isinstance(obj, DBusMethod):
#execute the selected method
@@ -114,7 +99,7 @@ class AddressInfo():
#update the object value so markup string is calculated correct
obj.value = result[0]
#set new markup string
- model[iter][0] = obj.markup_str
+ model[iter_][0] = obj.markup_str
else:
if treeview.row_expanded(path):
treeview.collapse_row(path)
@@ -122,12 +107,12 @@ class AddressInfo():
treeview.expand_row(path, False)
- def __treeview_row_expanded_cb(self, treeview, iter, path):
+ def __treeview_row_expanded_cb(self, treeview, iter_, path):
model = treeview.get_model()
- node = model.get(iter, 1)[0]
+ node = model.get(iter_, 1)[0]
if isinstance(node, DBusNode):
- if model.iter_has_child(iter):
- childiter = model.iter_children(iter)
+ if model.iter_has_child(iter_):
+ childiter = model.iter_children(iter_)
while childiter != None:
childpath = model.get_path(childiter)
treeview.expand_to_path(childpath)
@@ -248,7 +233,6 @@ class AddressInfo():
if __name__ == "__main__":
"""for debugging"""
- import sys
import argparse
parser = argparse.ArgumentParser(description='introspect a given dbus address and name')
diff --git a/dfeet/introspection_helper.py b/dfeet/introspection_helper.py
index db77274..f45c0ed 100644
--- a/dfeet/introspection_helper.py
+++ b/dfeet/introspection_helper.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from gi.repository import GObject, Gio, GLib
+from gi.repository import GObject, Gio
import dbus_utils
diff --git a/dfeet/settings.py b/dfeet/settings.py
index 81cf94e..0c9491a 100644
--- a/dfeet/settings.py
+++ b/dfeet/settings.py
@@ -169,6 +169,6 @@ class Settings:
new_file_dir = os.path.split(self.filename)[0]
if not os.path.isdir(new_file_dir):
os.makedirs(new_file_dir)
- file = open(self.filename, 'w')
- self.config.write(file)
- file.close()
+ f = open(self.filename, 'w')
+ self.config.write(f)
+ f.close()
diff --git a/tests/tests.py b/tests/tests.py
index 63f6ca0..7d999e7 100755
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -6,7 +6,6 @@ from gi.repository import Gtk, Gio, GLib
from dfeet.introspection import AddressInfo
from dfeet.introspection_helper import DBusNode, DBusInterface, DBusProperty, DBusSignal, DBusMethod
import unittest
-import time
XML = """
<node>
diff --git a/ui/introspection.ui b/ui/introspection.ui
index 4f9fbc9..44ea446 100644
--- a/ui/introspection.ui
+++ b/ui/introspection.ui
@@ -156,7 +156,6 @@
<property name="search_column">0</property>
<property name="enable_tree_lines">True</property>
<property name="tooltip_column">0</property>
- <signal name="cursor-changed" handler="treeview_cursor_changed_cb" swapped="no"/>
<signal name="row-activated" handler="treeview_row_activated_cb" swapped="no"/>
<signal name="row-expanded" handler="treeview_row_expanded_cb" swapped="no"/>
<child internal-child="selection">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
