From 3f7fbf67f33776b37bcab1fc7a3a7775247a0e26 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 7 Feb 2016 12:45:12 +0100 Subject: [PATCH] Fix remaining gi.repository imports --- mopidy/commands.py | 3 +-- mopidy/internal/network.py | 3 +-- tests/internal/network/test_connection.py | 3 +-- tests/internal/network/test_server.py | 3 +-- tests/internal/test_path.py | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/mopidy/commands.py b/mopidy/commands.py index af861032..74905f8f 100644 --- a/mopidy/commands.py +++ b/mopidy/commands.py @@ -7,14 +7,13 @@ import logging import os import sys -from gi.repository import GLib, GObject - import pykka from mopidy import config as config_lib, exceptions from mopidy.audio import Audio from mopidy.core import Core from mopidy.internal import deps, process, timer, versioning +from mopidy.internal.gi import GLib, GObject logger = logging.getLogger(__name__) diff --git a/mopidy/internal/network.py b/mopidy/internal/network.py index c956d795..cefdf8ea 100644 --- a/mopidy/internal/network.py +++ b/mopidy/internal/network.py @@ -7,11 +7,10 @@ import socket import sys import threading -from gi.repository import GObject - import pykka from mopidy.internal import encoding +from mopidy.internal.gi import GObject logger = logging.getLogger(__name__) diff --git a/tests/internal/network/test_connection.py b/tests/internal/network/test_connection.py index 291bbc46..9ee0aaf3 100644 --- a/tests/internal/network/test_connection.py +++ b/tests/internal/network/test_connection.py @@ -5,13 +5,12 @@ import logging import socket import unittest -from gi.repository import GObject - from mock import Mock, call, patch, sentinel import pykka from mopidy.internal import network +from mopidy.internal.gi import GObject from tests import any_int, any_unicode diff --git a/tests/internal/network/test_server.py b/tests/internal/network/test_server.py index 1df25dbc..072e24de 100644 --- a/tests/internal/network/test_server.py +++ b/tests/internal/network/test_server.py @@ -4,11 +4,10 @@ import errno import socket import unittest -from gi.repository import GObject - from mock import Mock, patch, sentinel from mopidy.internal import network +from mopidy.internal.gi import GObject from tests import any_int diff --git a/tests/internal/test_path.py b/tests/internal/test_path.py index 751e7c6e..9e09c39a 100644 --- a/tests/internal/test_path.py +++ b/tests/internal/test_path.py @@ -7,10 +7,9 @@ import shutil import tempfile import unittest -from gi.repository import GLib - from mopidy import compat, exceptions from mopidy.internal import path +from mopidy.internal.gi import GLib import tests