msmith - in flumotion/trunk: . bin flumotion/common
flumotion/launch flumotion/manager flumotion/test po
flumotion-commit at lists.fluendo.com
flumotion-commit at lists.fluendo.com
Fri Dec 28 11:55:39 CET 2007
Author: msmith
Date: Fri Dec 28 11:55:30 2007
New Revision: 6049
Added:
flumotion/trunk/flumotion/common/config.py
- copied unchanged from r6045, flumotion/trunk/flumotion/common/config.py
flumotion/trunk/flumotion/common/registry.py
- copied unchanged from r6045, flumotion/trunk/flumotion/common/registry.py
Removed:
flumotion/trunk/flumotion/manager/config.py
flumotion/trunk/flumotion/manager/registry.py
flumotion/trunk/flumotion/test/test_manager_config.py
flumotion/trunk/flumotion/test/test_manager_registry.py
Modified:
flumotion/trunk/ChangeLog
flumotion/trunk/bin/flumotion-debug
flumotion/trunk/flumotion/common/Makefile.am
flumotion/trunk/flumotion/common/testsuite.py
flumotion/trunk/flumotion/launch/inspect.py
flumotion/trunk/flumotion/launch/main.py
flumotion/trunk/flumotion/launch/parse.py
flumotion/trunk/flumotion/manager/Makefile.am
flumotion/trunk/flumotion/manager/admin.py
flumotion/trunk/flumotion/manager/component.py
flumotion/trunk/flumotion/manager/main.py
flumotion/trunk/flumotion/manager/manager.py
flumotion/trunk/flumotion/manager/worker.py
flumotion/trunk/flumotion/test/Makefile.am
flumotion/trunk/flumotion/test/comptest.py
flumotion/trunk/flumotion/test/test_component_init.py
flumotion/trunk/flumotion/test/test_config.py
flumotion/trunk/flumotion/test/test_manager_manager.py
flumotion/trunk/flumotion/test/test_registry.py
flumotion/trunk/po/POTFILES.in
Log:
Revert r6046, 6047: turns out we need the config and registry code in more
places than we thought. Sorry Johan!
Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog (original)
+++ flumotion/trunk/ChangeLog Fri Dec 28 11:55:30 2007
@@ -5,40 +5,6 @@
* flumotion/manager/manager.py:
Fix a couple of docstrings.
-2007-12-27 Johan Dahlin <johan at gnome.org>
-
- * po/POTFILES.in:
- Rename the tests here too.
-
- * flumotion/common/Makefile.am:
- * flumotion/common/config.py:
- * flumotion/common/registry.py:
- * flumotion/common/testsuite.py:
- * flumotion/launch/inspect.py:
- * flumotion/launch/main.py:
- * flumotion/launch/parse.py:
- * flumotion/manager/Makefile.am:
- * flumotion/manager/admin.py:
- * flumotion/manager/component.py:
- * flumotion/manager/config.py:
- * flumotion/manager/main.py:
- * flumotion/manager/manager.py:
- * flumotion/manager/registry.py:
- * flumotion/manager/worker.py:
- * flumotion/test/Makefile.am:
- * flumotion/test/comptest.py:
- * flumotion/test/test_component_init.py:
- * flumotion/test/test_config.py:
- * flumotion/test/test_manager_config.py:
- * flumotion/test/test_manager_manager.py:
- * flumotion/test/test_manager_registry.py:
- * flumotion/test/test_registry.py:
- * po/POTFILES.in:
-
- Move flumotion/common/{config.py,registry.py} into
- flumotion/manager.py. Rename tests too and update
- imports and POTFILES.
-
2007-12-27 Michael Smith <msmith at fluendo.com>
* flumotion/test/test_manager_manager.py:
Modified: flumotion/trunk/bin/flumotion-debug
==============================================================================
--- flumotion/trunk/bin/flumotion-debug (original)
+++ flumotion/trunk/bin/flumotion-debug Fri Dec 28 11:55:30 2007
@@ -6,7 +6,7 @@
import code
# Variable templates
-LIBDIR = '/opt/flumotion/lib'
+LIBDIR = '/opt/flumotion//lib'
PROGRAM_PATH = 'flumotion.manager.main.main'
# setup the project root
@@ -50,7 +50,7 @@
parser = OptionParser()
parser.add_option('-c', '--command',
action="store", type="string", dest="command",
- help="Program passed in as string (terminates option list)")
+ help="ogram passed in as string (terminates option list)")
options, args = parser.parse_args(args)
ns = globals().copy()
Modified: flumotion/trunk/flumotion/common/Makefile.am
==============================================================================
--- flumotion/trunk/flumotion/common/Makefile.am (original)
+++ flumotion/trunk/flumotion/common/Makefile.am Fri Dec 28 11:55:30 2007
@@ -11,6 +11,7 @@
connection.py \
common.py \
componentui.py \
+ config.py \
dag.py \
debug.py \
enum.py \
@@ -31,6 +32,7 @@
pygobject.py \
python.py \
reflectcall.py \
+ registry.py \
reload.py \
server.py \
setup.py \
Modified: flumotion/trunk/flumotion/common/testsuite.py
==============================================================================
--- flumotion/trunk/flumotion/common/testsuite.py (original)
+++ flumotion/trunk/flumotion/common/testsuite.py Fri Dec 28 11:55:30 2007
@@ -179,8 +179,8 @@
class TestCaseWithManager(TestCase):
def setUp(self):
from flumotion.twisted import pb
- from flumotion.common import server, connection
- from flumotion.manager import config, manager
+ from flumotion.common import config, server, connection
+ from flumotion.manager import manager
from StringIO import StringIO
managerConf = """
Modified: flumotion/trunk/flumotion/launch/inspect.py
==============================================================================
--- flumotion/trunk/flumotion/launch/inspect.py (original)
+++ flumotion/trunk/flumotion/launch/inspect.py Fri Dec 28 11:55:30 2007
@@ -23,9 +23,8 @@
import sys
-from flumotion.common import log, common
+from flumotion.common import log, common, registry
from flumotion.common.options import OptionParser
-from flumotion.manager import registry
def printMultiline(indent, data):
Modified: flumotion/trunk/flumotion/launch/main.py
==============================================================================
--- flumotion/trunk/flumotion/launch/main.py (original)
+++ flumotion/trunk/flumotion/launch/main.py Fri Dec 28 11:55:30 2007
@@ -66,10 +66,9 @@
from twisted.python import reflect
from twisted.internet import reactor, defer
-from flumotion.common import log, common, errors, messages
-from flumotion.common.options import OptionParser
-from flumotion.manager import registry
+from flumotion.common import log, common, registry, errors, messages
from flumotion.twisted import flavors
+from flumotion.common.options import OptionParser
from flumotion.launch import parse
Modified: flumotion/trunk/flumotion/launch/parse.py
==============================================================================
--- flumotion/trunk/flumotion/launch/parse.py (original)
+++ flumotion/trunk/flumotion/launch/parse.py Fri Dec 28 11:55:30 2007
@@ -30,9 +30,7 @@
import copy
import sys
-from flumotion.common import log, common, dag
-from flumotion.manager import config
-from flumotion.manager import registry
+from flumotion.common import log, config, common, dag, registry
__all__ = ['parse_args']
Modified: flumotion/trunk/flumotion/manager/Makefile.am
==============================================================================
--- flumotion/trunk/flumotion/manager/Makefile.am (original)
+++ flumotion/trunk/flumotion/manager/Makefile.am Fri Dec 28 11:55:30 2007
@@ -1,5 +1,5 @@
include $(top_srcdir)/common/python.mk
-
+
flumotiondir = $(libdir)/flumotion/python/flumotion/manager
flumotion_PYTHON = \
@@ -7,10 +7,8 @@
admin.py \
base.py \
component.py \
- config.py \
main.py \
manager.py \
- registry.py \
worker.py
TAGS_FILES = $(flumotion_PYTHON)
Modified: flumotion/trunk/flumotion/manager/admin.py
==============================================================================
--- flumotion/trunk/flumotion/manager/admin.py (original)
+++ flumotion/trunk/flumotion/manager/admin.py Fri Dec 28 11:55:30 2007
@@ -34,9 +34,8 @@
from twisted.python import failure
from zope.interface import implements
-from flumotion.common import errors, interfaces, log, planet, debug
from flumotion.manager import base
-from flumotion.manager import registry
+from flumotion.common import errors, interfaces, log, planet, registry, debug
# make Result and Message proxyable
from flumotion.common import messages
@@ -325,16 +324,16 @@
if None, no label will be set.
@type componentLabel: str or None
@param properties: List of property name-value pairs.
- See L{flumotion.manager.config.buildPropertyDict}
+ See L{flumotion.common.config.buildPropertyDict}
@type properties: [(str, object)]
@param workerName: the name of the worker where the added
component should run.
@type workerName: str
@param plugs: List of plugs, as type-propertyList pairs.
- See {flumotion.manager.config.buildPlugsSet}.
+ See {flumotion.common.config.buildPlugsSet}.
@type plugs: [(str, [(str, object)])]
@param eaters: List of (eater name, feed ID) pairs.
- See L{flumotion.manager.config.buildEatersDict}
+ See L{flumotion.common.config.buildEatersDict}
@type eaters: [(str, str)]
@param isClockMaster: True if the component to be added must be
a clock master. Passing False here means
@@ -343,7 +342,7 @@
for this flow.
@type isClockMaster: bool
@param virtualFeeds: List of (virtual feed, feeder name) pairs.
- See L{flumotion.manager.config.buildVirtualFeeds}
+ See L{flumotion.common.config.buildVirtualFeeds}
@type virtualFeeds: [(str, str)]
"""
return self.vishnu.loadComponent(self.remoteIdentity, componentType,
Modified: flumotion/trunk/flumotion/manager/component.py
==============================================================================
--- flumotion/trunk/flumotion/manager/component.py (original)
+++ flumotion/trunk/flumotion/manager/component.py Fri Dec 28 11:55:30 2007
@@ -37,8 +37,7 @@
from flumotion.configure import configure
from flumotion.manager import base
-from flumotion.manager import config
-from flumotion.common import errors, interfaces, keycards, log, planet
+from flumotion.common import errors, interfaces, keycards, log, config, planet
from flumotion.common import messages, common
from flumotion.twisted import flavors
from flumotion.common.planet import moods
Modified: flumotion/trunk/flumotion/manager/main.py
==============================================================================
--- flumotion/trunk/flumotion/manager/main.py (original)
+++ flumotion/trunk/flumotion/manager/main.py Fri Dec 28 11:55:30 2007
@@ -30,12 +30,11 @@
from twisted.internet import reactor, error
-from flumotion.common import log, common, errors, setup
+from flumotion.manager import manager
+from flumotion.common import log, config, common, errors, setup
from flumotion.configure import configure
from flumotion.common import server
from flumotion.common.options import OptionGroup, OptionParser
-from flumotion.manager import config
-from flumotion.manager import manager
defaultSSLPort = configure.defaultSSLManagerPort
defaultTCPPort = configure.defaultTCPManagerPort
Modified: flumotion/trunk/flumotion/manager/manager.py
==============================================================================
--- flumotion/trunk/flumotion/manager/manager.py (original)
+++ flumotion/trunk/flumotion/manager/manager.py Fri Dec 28 11:55:30 2007
@@ -41,13 +41,12 @@
from twisted.cred import portal
from zope.interface import implements
-from flumotion.common import errors, interfaces, log
+from flumotion.common import config, errors, interfaces, log, registry
from flumotion.common import planet, common, dag, messages, reflectcall, server
from flumotion.common.identity import RemoteIdentity, LocalIdentity
from flumotion.common.planet import moods
from flumotion.configure import configure
-from flumotion.manager import admin, component, worker, base, registry
-from flumotion.manager import config
+from flumotion.manager import admin, component, worker, base
from flumotion.twisted import checkers
from flumotion.twisted import portal as fportal
Modified: flumotion/trunk/flumotion/manager/worker.py
==============================================================================
--- flumotion/trunk/flumotion/manager/worker.py (original)
+++ flumotion/trunk/flumotion/manager/worker.py Fri Dec 28 11:55:30 2007
@@ -27,11 +27,9 @@
from twisted.internet import defer
-from flumotion.common import errors, interfaces, log
-from flumotion.common import worker, common
from flumotion.manager import base
-from flumotion.manager import registry
-
+from flumotion.common import errors, interfaces, log, registry
+from flumotion.common import worker, common
class WorkerAvatar(base.ManagerAvatar):
"""
Modified: flumotion/trunk/flumotion/test/Makefile.am
==============================================================================
--- flumotion/trunk/flumotion/test/Makefile.am (original)
+++ flumotion/trunk/flumotion/test/Makefile.am Fri Dec 28 11:55:30 2007
@@ -43,6 +43,7 @@
test_component_playlist.py \
test_component.py \
test_comptest.py \
+ test_config.py \
test_configure.py \
test_credentials.py \
test_dag.py \
@@ -57,9 +58,7 @@
test_keycards.py \
test_logfilter.py \
test_manager_admin.py \
- test_manager_config.py \
test_manager_manager.py \
- test_manager_registry.py \
test_manager_worker.py \
test_misc_httpfile.py \
test_options.py \
@@ -69,6 +68,7 @@
test_porter.py \
test_public_ui_api.py \
test_reflect.py \
+ test_registry.py \
test_saltsha256.py \
test_testclasses.py \
test_twisted_integration.py \
Modified: flumotion/trunk/flumotion/test/comptest.py
==============================================================================
--- flumotion/trunk/flumotion/test/comptest.py (original)
+++ flumotion/trunk/flumotion/test/comptest.py Fri Dec 28 11:55:30 2007
@@ -37,10 +37,9 @@
from twisted.python import failure
from twisted.internet import reactor, defer, interfaces
-from flumotion.common import log, common
+from flumotion.common import registry, log, common
from flumotion.component.producers.pipeline.pipeline import Producer
from flumotion.component.converters.pipeline.pipeline import Converter
-from flumotion.manager import registry
from flumotion.twisted import flavors
__all__ = ['ComponentTestHelper', 'ComponentUnitTestMixin', 'pipeline_src',
Modified: flumotion/trunk/flumotion/test/test_component_init.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_component_init.py (original)
+++ flumotion/trunk/flumotion/test/test_component_init.py Fri Dec 28 11:55:30 2007
@@ -24,8 +24,7 @@
from twisted.trial import unittest
from flumotion.common import testsuite
-from flumotion.common import log, reflectcall
-from flumotion.manager import registry
+from flumotion.common import registry, log, reflectcall
class TestInit(testsuite.TestCase):
Modified: flumotion/trunk/flumotion/test/test_config.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_config.py (original)
+++ flumotion/trunk/flumotion/test/test_config.py Fri Dec 28 11:55:30 2007
@@ -1,4 +1,4 @@
-# -*- Mode: Python; test-case-name:flumotion.test.test_manager_config -*-
+# -*- Mode: Python; test-case-name:flumotion.test.test_config -*-
# vi:si:et:sw=4:sts=4:ts=4
#
# Flumotion - a streaming media server
@@ -23,10 +23,8 @@
from StringIO import StringIO
-from flumotion.common import errors
+from flumotion.common import config, registry, errors
from flumotion.common import testsuite
-from flumotion.manager import config
-from flumotion.manager import registry
regchunk = """
<registry>
Modified: flumotion/trunk/flumotion/test/test_manager_manager.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_manager_manager.py (original)
+++ flumotion/trunk/flumotion/test/test_manager_manager.py Fri Dec 28 11:55:30 2007
@@ -32,7 +32,6 @@
from flumotion.common import testsuite
from flumotion.common.planet import moods
from flumotion.manager import component, manager
-from flumotion.manager import registry
from flumotion.twisted import flavors
@@ -325,6 +324,7 @@
def setUp(self):
# load and verify registry
+ from flumotion.common import registry
reg = registry.getRegistry()
self.vishnu = manager.Vishnu('test', unsafeTracebacks=1)
Modified: flumotion/trunk/flumotion/test/test_registry.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_registry.py (original)
+++ flumotion/trunk/flumotion/test/test_registry.py Fri Dec 28 11:55:30 2007
@@ -1,4 +1,4 @@
-# -*- Mode: Python; test-case-name: flumotion.test.test_manager_registry -*-
+# -*- Mode: Python; test-case-name: flumotion.test.test_registry -*-
# vi:si:et:sw=4:sts=4:ts=4
#
# Flumotion - a streaming media server
@@ -28,8 +28,7 @@
warnings.filterwarnings('ignore', category=FutureWarning)
from flumotion.common import testsuite
-from flumotion.common import fxml, common
-from flumotion.manager import registry
+from flumotion.common import registry, fxml, common
class TestRegistry(testsuite.TestCase):
Modified: flumotion/trunk/po/POTFILES.in
==============================================================================
--- flumotion/trunk/po/POTFILES.in (original)
+++ flumotion/trunk/po/POTFILES.in Fri Dec 28 11:55:30 2007
@@ -5,8 +5,6 @@
flumotion/manager/manager.py
flumotion/manager/component.py
flumotion/manager/__init__.py
-flumotion/manager/registry.py
-flumotion/manager/config.py
flumotion/common/pygobject.py
flumotion/common/options.py
flumotion/common/reflectcall.py
@@ -15,6 +13,7 @@
flumotion/common/errors.py
flumotion/common/enum.py
flumotion/common/boot.py
+flumotion/common/registry.py
flumotion/common/planet.py
flumotion/common/bundleclient.py
flumotion/common/identity.py
@@ -39,6 +38,7 @@
flumotion/common/keycards.py
flumotion/common/medium.py
flumotion/common/setup.py
+flumotion/common/config.py
flumotion/common/avltree.py
flumotion/common/gstreamer.py
flumotion/common/python.py
@@ -271,7 +271,7 @@
flumotion/test/test_public_ui_api.py
flumotion/test/test_component_bouncers_bouncer.py
flumotion/test/test_component_httpserver.py
-flumotion/test/test_manager_registry.py
+flumotion/test/test_registry.py
flumotion/test/test_component_init.py
flumotion/test/test_component.py
flumotion/test/test_testclasses.py
@@ -296,7 +296,7 @@
flumotion/test/test_admin_admin.py
flumotion/test/test_common_avltree.py
flumotion/test/test_component_playlist.py
-flumotion/test/test_manager_config.py
+flumotion/test/test_config.py
flumotion/test/test_saltsha256.py
flumotion/test/test_ui_fgtk.py
flumotion/test/test_wizard.py
More information about the flumotion-commit
mailing list