[pitivi/ges: 166/287] utils: Move system.py into utils
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/ges: 166/287] utils: Move system.py into utils
- Date: Thu, 15 Mar 2012 16:39:47 +0000 (UTC)
commit 38da7caea29b7f70e08922c3b4f9d3738cd1c047
Author: Thibault Saunier <thibault saunier collabora com>
Date: Mon Jan 9 15:58:37 2012 -0300
utils: Move system.py into utils
pitivi/Makefile.am | 1 -
pitivi/application.py | 3 ++-
pitivi/utils/Makefile.am | 3 ++-
pitivi/{ => utils}/system.py | 0
tests/test_system.py | 2 +-
tests/test_system_gnome.py | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index e727e9b..61d8924 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -18,7 +18,6 @@ pitivi_PYTHON = \
receiver.py \
settings.py \
sourcelist.py \
- system.py \
threads.py \
thumbnailcache.py
diff --git a/pitivi/application.py b/pitivi/application.py
index 196743b..c7bdeb6 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -41,8 +41,9 @@ from pitivi.effects import EffectsHandler
from pitivi.configure import APPNAME
from pitivi.settings import GlobalSettings
from pitivi.threads import ThreadMaster
+
from pitivi.utils.signal import Signallable
-from pitivi.system import getSystem
+from pitivi.utils.system import getSystem
from pitivi.utils.loggable import Loggable
import pitivi.utils.loggable as log
from pitivi.ui.mainwindow import PitiviMainWindow
diff --git a/pitivi/utils/Makefile.am b/pitivi/utils/Makefile.am
index 97a9e79..e5b9dbd 100644
--- a/pitivi/utils/Makefile.am
+++ b/pitivi/utils/Makefile.am
@@ -9,7 +9,8 @@ utils_PYTHON = \
loggable.py \
playback.py \
signal.py \
- ui.py \
+ ui.py \
+ system.py \
misc.py
clean-local:
diff --git a/pitivi/system.py b/pitivi/utils/system.py
similarity index 100%
rename from pitivi/system.py
rename to pitivi/utils/system.py
diff --git a/tests/test_system.py b/tests/test_system.py
index 507b2fa..40756fa 100644
--- a/tests/test_system.py
+++ b/tests/test_system.py
@@ -1,5 +1,5 @@
from unittest import TestCase
-from pitivi.system import System
+from pitivi.utils.system import System
class TestSystem(TestCase):
diff --git a/tests/test_system_gnome.py b/tests/test_system_gnome.py
index 8e0a0fa..2b0bd46 100644
--- a/tests/test_system_gnome.py
+++ b/tests/test_system_gnome.py
@@ -1,5 +1,5 @@
from unittest import TestCase
-from pitivi.system import getSystem, GnomeSystem, \
+from pitivi.utils.system import getSystem, GnomeSystem, \
INHIBIT_LOGOUT, INHIBIT_SUSPEND, INHIBIT_SESSION_IDLE, \
INHIBIT_USER_SWITCHING
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]