diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py index f3c2722123..e31a49f7fd 100644 --- a/extensions/cpsection/keyboard/view.py +++ b/extensions/cpsection/keyboard/view.py @@ -75,7 +75,7 @@ class LayoutCombo(Gtk.Box): } def __init__(self, keyboard_manager, n): - GObject.GObject.__init__(self) + super().__init__() self._keyboard_manager = keyboard_manager self._index = n diff --git a/extensions/deviceicon/audio.py b/extensions/deviceicon/audio.py index e1b7c12487..60bbf37d12 100644 --- a/extensions/deviceicon/audio.py +++ b/extensions/deviceicon/audio.py @@ -245,7 +245,7 @@ class DeviceModelAudio(GObject.GObject): } def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._device = None self._last_level = 0 diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py index 32ee4f15fb..a88087914d 100644 --- a/extensions/deviceicon/battery.py +++ b/extensions/deviceicon/battery.py @@ -197,7 +197,7 @@ class DeviceModel(GObject.GObject): } def __init__(self, battery): - GObject.GObject.__init__(self) + super().__init__() self._battery = UPowerGlib.Device() self._battery.set_object_path_sync(battery, None) self._connect_battery() diff --git a/src/jarabe/desktop/grid.py b/src/jarabe/desktop/grid.py index 48b32d4eed..614bb7e74d 100644 --- a/src/jarabe/desktop/grid.py +++ b/src/jarabe/desktop/grid.py @@ -36,7 +36,7 @@ class Grid(SugarExt.Grid): } def __init__(self, width, height): - GObject.GObject.__init__(self) + super().__init__() self._children = [] self._child_rects = {} diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 9c73f80941..dde01b1794 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -180,7 +180,7 @@ class DeviceObserver(GObject.GObject): } def __init__(self, device): - GObject.GObject.__init__(self) + super().__init__() self._bus = dbus.SystemBus() self.device = device diff --git a/src/jarabe/frame/clipboard.py b/src/jarabe/frame/clipboard.py index 315aece02f..15dcb2eff8 100644 --- a/src/jarabe/frame/clipboard.py +++ b/src/jarabe/frame/clipboard.py @@ -45,7 +45,7 @@ class Clipboard(GObject.GObject): } def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._objects = {} self._next_id = 0 diff --git a/src/jarabe/frame/eventarea.py b/src/jarabe/frame/eventarea.py index 35d78cdce6..97efed31d4 100644 --- a/src/jarabe/frame/eventarea.py +++ b/src/jarabe/frame/eventarea.py @@ -36,7 +36,7 @@ class EventArea(GObject.GObject): } def __init__(self, settings): - GObject.GObject.__init__(self) + super().__init__() self._hover = False self._sids = {} diff --git a/src/jarabe/journal/iconmodel.py b/src/jarabe/journal/iconmodel.py index 713b89c09d..e4608d07bb 100644 --- a/src/jarabe/journal/iconmodel.py +++ b/src/jarabe/journal/iconmodel.py @@ -46,7 +46,7 @@ class IconModel(GObject.GObject, Gtk.TreeModel, Gtk.TreeDragSource): _PAGE_SIZE = 100 def __init__(self, query): - GObject.GObject.__init__(self) + super().__init__() self._last_requested_index = None self._cached_row = None diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py index cb13a39018..cb0962d301 100644 --- a/src/jarabe/journal/listmodel.py +++ b/src/jarabe/journal/listmodel.py @@ -75,7 +75,7 @@ class ListModel(GObject.GObject, Gtk.TreeModel, Gtk.TreeDragSource): _PAGE_SIZE = 10 def __init__(self, query): - GObject.GObject.__init__(self) + super().__init__() self._last_requested_index = None self._temp_drag_file_uid = None diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py index feb82e4e40..97a6625268 100644 --- a/src/jarabe/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -579,7 +579,7 @@ def __init__(self, journalactivity, uid_list, alert_title, alert_message, operation_cb): - GObject.GObject.__init__(self) + super().__init__() self._journalactivity = journalactivity diff --git a/src/jarabe/model/adhoc.py b/src/jarabe/model/adhoc.py index 78ca8d1ed2..e27dd7a04f 100644 --- a/src/jarabe/model/adhoc.py +++ b/src/jarabe/model/adhoc.py @@ -57,7 +57,7 @@ class AdHocManager(GObject.GObject): _CHANNEL_11 = 11 def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._bus = dbus.SystemBus() self._device = None diff --git a/src/jarabe/model/brightness.py b/src/jarabe/model/brightness.py index e046d4f1b4..a05ac21ad5 100644 --- a/src/jarabe/model/brightness.py +++ b/src/jarabe/model/brightness.py @@ -39,7 +39,7 @@ class Brightness(GObject.GObject): changed_signal = GObject.Signal('changed', arg_types=([int])) def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._path = None self._helper_path = None self._max_brightness = None diff --git a/src/jarabe/model/buddy.py b/src/jarabe/model/buddy.py index 6ae3299a9f..05dde2489c 100644 --- a/src/jarabe/model/buddy.py +++ b/src/jarabe/model/buddy.py @@ -43,7 +43,7 @@ def __init__(self, **kwargs): self._tags = None self._current_activity = None - GObject.GObject.__init__(self, **kwargs) + super().__init__(**kwargs) def get_nick(self): return self._nick diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py index 57bd7ec358..dfdfa8093d 100644 --- a/src/jarabe/model/bundleregistry.py +++ b/src/jarabe/model/bundleregistry.py @@ -72,7 +72,7 @@ class BundleRegistry(GObject.GObject): def __init__(self): logging.debug('STARTUP: Loading the bundle registry') - GObject.GObject.__init__(self) + super().__init__() self._mime_defaults = self._load_mime_defaults() diff --git a/src/jarabe/model/desktop.py b/src/jarabe/model/desktop.py index 47c912bc4d..ed75bd88cc 100644 --- a/src/jarabe/model/desktop.py +++ b/src/jarabe/model/desktop.py @@ -33,7 +33,7 @@ class DesktopViewModel(GObject.GObject): } def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._number_of_views = 1 self._view_icons = None diff --git a/src/jarabe/model/filetransfer.py b/src/jarabe/model/filetransfer.py index aef04007de..84b4a29445 100644 --- a/src/jarabe/model/filetransfer.py +++ b/src/jarabe/model/filetransfer.py @@ -64,7 +64,7 @@ class BaseFileTransfer(GObject.GObject): def __init__(self, connection): - GObject.GObject.__init__(self) + super().__init__() self._connection = connection self._state = FT_STATE_NONE self._transferred_bytes = 0 diff --git a/src/jarabe/model/friends.py b/src/jarabe/model/friends.py index 6cc48aa32e..c5dc0464d6 100644 --- a/src/jarabe/model/friends.py +++ b/src/jarabe/model/friends.py @@ -105,7 +105,7 @@ class Friends(GObject.GObject): } def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._friends = {} self._path = os.path.join(env.get_profile_path(), 'friends') diff --git a/src/jarabe/model/invites.py b/src/jarabe/model/invites.py index a8f3d52ce5..bd9e70c45b 100644 --- a/src/jarabe/model/invites.py +++ b/src/jarabe/model/invites.py @@ -161,7 +161,7 @@ class Invites(GObject.GObject): } def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._dispatch_operations = {} diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py index fd8f4da8c5..39fabbfdf6 100644 --- a/src/jarabe/model/neighborhood.py +++ b/src/jarabe/model/neighborhood.py @@ -87,7 +87,7 @@ class ActivityModel(GObject.GObject): } def __init__(self, activity_id, room_handle): - GObject.GObject.__init__(self) + super().__init__() self.activity_id = activity_id self.room_handle = room_handle @@ -188,7 +188,7 @@ class _Account(GObject.GObject): } def __init__(self, account_path): - GObject.GObject.__init__(self) + super().__init__() self.object_path = account_path @@ -754,7 +754,7 @@ class Neighborhood(GObject.GObject): } def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._buddies = {None: get_owner_instance()} self._activities = {} diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index 6e8227bf32..9495a73fb8 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -639,7 +639,7 @@ class AccessPoint(GObject.GObject): } def __init__(self, device, model): - GObject.GObject.__init__(self) + super().__init__() self.device = device self.model = model @@ -787,7 +787,7 @@ class Connection(GObject.GObject): } def __init__(self, bus, path): - GObject.GObject.__init__(self) + super().__init__() obj = bus.get_object(NM_SERVICE, path) self._connection = dbus.Interface(obj, NM_CONNECTION_IFACE) self._removed_handle = self._connection.connect_to_signal( diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index 175655dac7..67ad0e208e 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -43,7 +43,7 @@ class SessionManager(GObject.GObject): MAX_SHUTDOWN_TRIES = 10 def __init__(self): - GObject.GObject.__init__(self) + super().__init__() #address = SugarExt.xsmp_init() #os.environ['SESSION_MANAGER'] = address diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index a0571cf97b..3c70cd442d 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -72,7 +72,7 @@ def __init__(self, activity_info, activity_id, color, window=None): _windows -- GtkWindows registered for the activity. The lowest one in the stack is the main window. """ - GObject.GObject.__init__(self) + super().__init__() self._windows = [] self._service = None diff --git a/src/jarabe/model/update/aslo.py b/src/jarabe/model/update/aslo.py index d741e03ed4..26bb4dc1c8 100644 --- a/src/jarabe/model/update/aslo.py +++ b/src/jarabe/model/update/aslo.py @@ -78,7 +78,7 @@ class _UpdateChecker(GObject.GObject): _CHUNK_SIZE = 10240 def __init__(self): - GObject.GObject.__init__(self) + super().__init__() self._bundle = None def check(self, bundle): diff --git a/src/jarabe/model/update/microformat.py b/src/jarabe/model/update/microformat.py index 5786c214af..b9bcb1d9fe 100644 --- a/src/jarabe/model/update/microformat.py +++ b/src/jarabe/model/update/microformat.py @@ -356,7 +356,7 @@ class MetadataLookup(GObject.GObject): } def __init__(self, url): - GObject.GObject.__init__(self) + super().__init__() self._url = url self._icon_file_name = None self._size = None diff --git a/src/jarabe/model/update/updater.py b/src/jarabe/model/update/updater.py index b43eb26b56..99381af7b8 100644 --- a/src/jarabe/model/update/updater.py +++ b/src/jarabe/model/update/updater.py @@ -66,7 +66,7 @@ class Updater(GObject.GObject): } def __init__(self): - GObject.GObject.__init__(self) + super().__init__() settings = Gio.Settings.new(_UPDATE_KEYS_PATH) backend = settings.get_string(_UPDATE_BACKEND_KEY) diff --git a/src/jarabe/util/downloader.py b/src/jarabe/util/downloader.py index e5ebd75af7..d1f5843031 100644 --- a/src/jarabe/util/downloader.py +++ b/src/jarabe/util/downloader.py @@ -62,7 +62,7 @@ class Downloader(GObject.GObject): } def __init__(self, url, session=None, request_headers=None): - GObject.GObject.__init__(self) + super().__init__() self._uri = GLib.Uri.parse(url, GLib.UriFlags.NONE) self._session = session or get_soup_session() self._pending_buffers = [] diff --git a/src/jarabe/util/telepathy/connection_watcher.py b/src/jarabe/util/telepathy/connection_watcher.py index b579402bd1..295d72900d 100644 --- a/src/jarabe/util/telepathy/connection_watcher.py +++ b/src/jarabe/util/telepathy/connection_watcher.py @@ -45,7 +45,7 @@ class ConnectionWatcher(GObject.GObject): } def __init__(self, bus=None): - GObject.GObject.__init__(self) + super().__init__() if bus is None: self.bus = dbus.Bus()