From 7d3a889c1903aa6246fab8e802db04ac9e118e85 Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Tue, 6 Jul 2010 13:51:22 +0200 Subject: [PATCH] s/frontends/applications, third --- weboob/applications/boobank/setup.py | 6 +++--- weboob/applications/masstransit/setup.py | 6 +++--- weboob/applications/monboob/setup.py | 6 +++--- weboob/applications/qboobmsg/setup.py | 9 ++++----- weboob/applications/qhavesex/main_window.py | 2 +- weboob/applications/qhavesex/setup.py | 9 ++++----- weboob/applications/qvideoob/main_window.py | 2 +- weboob/applications/qvideoob/minivideo.py | 2 +- weboob/applications/qvideoob/setup.py | 9 ++++----- weboob/applications/qvideoob/video.py | 2 +- weboob/applications/travel/setup.py | 6 +++--- weboob/applications/videoob/setup.py | 6 +++--- weboob/applications/videoob_web/setup.py | 10 +++++----- weboob/applications/weboobcfg/weboobcfg.py | 10 +++++----- weboob/applications/weboorrents/setup.py | 6 +++--- weboob/applications/wetboobs/setup.py | 6 +++--- 16 files changed, 47 insertions(+), 50 deletions(-) diff --git a/weboob/applications/boobank/setup.py b/weboob/applications/boobank/setup.py index e0287d59..ea59f632 100755 --- a/weboob/applications/boobank/setup.py +++ b/weboob/applications/boobank/setup.py @@ -31,11 +31,11 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/Boobank', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.boobank', + 'weboob.applications', + 'weboob.applications.boobank', ], scripts=[ 'scripts/boobank', diff --git a/weboob/applications/masstransit/setup.py b/weboob/applications/masstransit/setup.py index c9cbda3a..0f33fbfb 100755 --- a/weboob/applications/masstransit/setup.py +++ b/weboob/applications/masstransit/setup.py @@ -31,11 +31,11 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/Masstransit', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.masstransit', + 'weboob.applications', + 'weboob.applications.masstransit', ], scripts=[ 'scripts/masstransit', diff --git a/weboob/applications/monboob/setup.py b/weboob/applications/monboob/setup.py index 616e9415..bcf46f99 100755 --- a/weboob/applications/monboob/setup.py +++ b/weboob/applications/monboob/setup.py @@ -30,11 +30,11 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/Monboob', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.monboob', + 'weboob.applications', + 'weboob.applications.monboob', ], scripts=[ 'scripts/monboob', diff --git a/weboob/applications/qboobmsg/setup.py b/weboob/applications/qboobmsg/setup.py index fc0ac970..f736969d 100755 --- a/weboob/applications/qboobmsg/setup.py +++ b/weboob/applications/qboobmsg/setup.py @@ -32,18 +32,17 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/QBoobMsg', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.qboobmsg', - 'weboob.frontends.qboobmsg.ui', + 'weboob.applications', + 'weboob.applications.qboobmsg', + 'weboob.applications.qboobmsg.ui', ], scripts=[ 'scripts/qboobmsg', ], install_requires=[ - 'weboob-core-qt', 'weboob-messages-backends', ], ) diff --git a/weboob/applications/qhavesex/main_window.py b/weboob/applications/qhavesex/main_window.py index 803488ec..276d6948 100644 --- a/weboob/applications/qhavesex/main_window.py +++ b/weboob/applications/qhavesex/main_window.py @@ -22,7 +22,7 @@ from weboob.tools.application.qt import QtMainWindow from weboob.tools.application.qt.backendcfg import BackendCfg from weboob.capabilities.dating import ICapDating -from weboob.frontends.qboobmsg.messages_manager import MessagesManager +from weboob.applications.qboobmsg.messages_manager import MessagesManager from .ui.main_window_ui import Ui_MainWindow from .status import AccountsStatus diff --git a/weboob/applications/qhavesex/setup.py b/weboob/applications/qhavesex/setup.py index 3a65ffb9..f75e6eaa 100755 --- a/weboob/applications/qhavesex/setup.py +++ b/weboob/applications/qhavesex/setup.py @@ -33,18 +33,17 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/QHaveSex', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.qhavesex', - 'weboob.frontends.qhavesex.ui', + 'weboob.applications', + 'weboob.applications.qhavesex', + 'weboob.applications.qhavesex.ui', ], scripts=[ 'scripts/qhavesex', ], install_requires=[ - 'weboob-core-qt', 'weboob-dating-backends', ], ) diff --git a/weboob/applications/qvideoob/main_window.py b/weboob/applications/qvideoob/main_window.py index 0aff986c..c2e8bcf2 100644 --- a/weboob/applications/qvideoob/main_window.py +++ b/weboob/applications/qvideoob/main_window.py @@ -20,7 +20,7 @@ from PyQt4.QtCore import SIGNAL from weboob.tools.application.qt import QtMainWindow, QtDo -from weboob.frontends.qvideoob.ui.main_window_ui import Ui_MainWindow +from weboob.applications.qvideoob.ui.main_window_ui import Ui_MainWindow from .video import Video from .minivideo import MiniVideo diff --git a/weboob/applications/qvideoob/minivideo.py b/weboob/applications/qvideoob/minivideo.py index 71b3bc6f..60fc39ac 100644 --- a/weboob/applications/qvideoob/minivideo.py +++ b/weboob/applications/qvideoob/minivideo.py @@ -19,7 +19,7 @@ import urllib2 from PyQt4.QtGui import QFrame, QImage, QPixmap -from weboob.frontends.qvideoob.ui.minivideo_ui import Ui_MiniVideo +from weboob.applications.qvideoob.ui.minivideo_ui import Ui_MiniVideo from .video import Video class MiniVideo(QFrame): diff --git a/weboob/applications/qvideoob/setup.py b/weboob/applications/qvideoob/setup.py index c8b18828..52ccc443 100755 --- a/weboob/applications/qvideoob/setup.py +++ b/weboob/applications/qvideoob/setup.py @@ -33,18 +33,17 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/QVideoob', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.qvideoob', - 'weboob.frontends.qvideoob.ui', + 'weboob.applications', + 'weboob.applications.qvideoob', + 'weboob.applications.qvideoob.ui', ], scripts=[ 'scripts/qvideoob', ], install_requires=[ - 'weboob-core-qt', 'weboob-video-backends', ], ) diff --git a/weboob/applications/qvideoob/video.py b/weboob/applications/qvideoob/video.py index 4092d475..647c8dd8 100644 --- a/weboob/applications/qvideoob/video.py +++ b/weboob/applications/qvideoob/video.py @@ -20,7 +20,7 @@ from PyQt4.QtCore import QUrl from PyQt4.QtGui import QDialog from PyQt4.phonon import Phonon -from weboob.frontends.qvideoob.ui.video_ui import Ui_Video +from weboob.applications.qvideoob.ui.video_ui import Ui_Video class Video(QDialog): def __init__(self, video, parent=None): diff --git a/weboob/applications/travel/setup.py b/weboob/applications/travel/setup.py index 1a60f689..a6f4d243 100755 --- a/weboob/applications/travel/setup.py +++ b/weboob/applications/travel/setup.py @@ -31,11 +31,11 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/Travel', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.travel', + 'weboob.applications', + 'weboob.applications.travel', ], scripts=[ 'scripts/travel', diff --git a/weboob/applications/videoob/setup.py b/weboob/applications/videoob/setup.py index f0c7b93e..abe8aefd 100755 --- a/weboob/applications/videoob/setup.py +++ b/weboob/applications/videoob/setup.py @@ -31,11 +31,11 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/Videoob', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.videoob', + 'weboob.applications', + 'weboob.applications.videoob', ], scripts=[ 'scripts/videoob', diff --git a/weboob/applications/videoob_web/setup.py b/weboob/applications/videoob_web/setup.py index 3368b261..33c36922 100755 --- a/weboob/applications/videoob_web/setup.py +++ b/weboob/applications/videoob_web/setup.py @@ -31,13 +31,13 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/VideoobWeb', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.videoob_web', - 'weboob.frontends.videoob_web.public', - 'weboob.frontends.videoob_web.templates', + 'weboob.applications', + 'weboob.applications.videoob_web', + 'weboob.applications.videoob_web.public', + 'weboob.applications.videoob_web.templates', ], scripts=[ 'scripts/videoob-web-server', diff --git a/weboob/applications/weboobcfg/weboobcfg.py b/weboob/applications/weboobcfg/weboobcfg.py index 6d623e60..e02bbc76 100644 --- a/weboob/applications/weboobcfg/weboobcfg.py +++ b/weboob/applications/weboobcfg/weboobcfg.py @@ -61,16 +61,16 @@ class WeboobCfg(ConsoleApplication): @ConsoleApplication.command('List applications') def command_applications(self, *caps): - import weboob.frontends - path = weboob.frontends.__path__[0] - frontends = [] + import weboob.applications + path = weboob.applications.__path__[0] + applications = [] regexp = re.compile('^%s/([\w\d_]+)$' % path) for root, dirs, files in os.walk(path): m = regexp.match(root) if m and '__init__.py' in files: - frontends.append(m.group(1)) + applications.append(m.group(1)) - print ' '.join(frontends) + print ' '.join(applications) @ConsoleApplication.command('Display a module') def command_modinfo(self, name): diff --git a/weboob/applications/weboorrents/setup.py b/weboob/applications/weboorrents/setup.py index 139b3bd9..5f3e4a20 100755 --- a/weboob/applications/weboorrents/setup.py +++ b/weboob/applications/weboorrents/setup.py @@ -31,11 +31,11 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/Weboorrents', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.weboorrents', + 'weboob.applications', + 'weboob.applications.weboorrents', ], scripts=[ 'scripts/weboorrents', diff --git a/weboob/applications/wetboobs/setup.py b/weboob/applications/wetboobs/setup.py index bd675ef9..ceb443fd 100755 --- a/weboob/applications/wetboobs/setup.py +++ b/weboob/applications/wetboobs/setup.py @@ -30,11 +30,11 @@ setup( author_email='weboob@lists.symlink.me', license='GPLv3', url='http://weboob.org/Wetboobs', - namespace_packages = ['weboob', 'weboob.frontends'], + namespace_packages = ['weboob', 'weboob.applications'], packages=[ 'weboob', - 'weboob.frontends', - 'weboob.frontends.wetboobs', + 'weboob.applications', + 'weboob.applications.wetboobs', ], scripts=[ 'scripts/wetboobs',