jdahlin - in flumotion/trunk: . flumotion/admin
flumotion/admin/command flumotion/admin/gtk
flumotion/admin/rrdmon flumotion/admin/text
flumotion-commit at lists.fluendo.com
flumotion-commit at lists.fluendo.com
Fri Dec 21 17:43:19 CET 2007
Author: jdahlin
Date: Fri Dec 21 17:42:00 2007
New Revision: 6033
Modified:
flumotion/trunk/ChangeLog
flumotion/trunk/flumotion/admin/admin.py
flumotion/trunk/flumotion/admin/command/commands.py
flumotion/trunk/flumotion/admin/command/main.py
flumotion/trunk/flumotion/admin/command/utils.py
flumotion/trunk/flumotion/admin/gtk/client.py
flumotion/trunk/flumotion/admin/gtk/componentview.py
flumotion/trunk/flumotion/admin/gtk/main.py
flumotion/trunk/flumotion/admin/multi.py
flumotion/trunk/flumotion/admin/rrdmon/config.py
flumotion/trunk/flumotion/admin/rrdmon/main.py
flumotion/trunk/flumotion/admin/rrdmon/rrdmon.py
flumotion/trunk/flumotion/admin/text/admin_text.py
flumotion/trunk/flumotion/admin/text/connection.py
flumotion/trunk/flumotion/admin/text/greeter.py
flumotion/trunk/flumotion/admin/text/main.py
flumotion/trunk/flumotion/admin/text/view.py
Log:
2007-12-21 Johan Dahlin <johan at gnome.org>
* flumotion/admin/*: Make pyflakes clean
Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog (original)
+++ flumotion/trunk/ChangeLog Fri Dec 21 17:42:00 2007
@@ -1,5 +1,7 @@
2007-12-21 Johan Dahlin <johan at gnome.org>
+ * flumotion/admin/*: Make pyflakes clean
+
* flumotion/component/encoders/encodingprofile.py (Int.__init__):
Don't use **kwargs to make pychecker happy
Modified: flumotion/trunk/flumotion/admin/admin.py
==============================================================================
--- flumotion/trunk/flumotion/admin/admin.py (original)
+++ flumotion/trunk/flumotion/admin/admin.py Fri Dec 21 17:42:00 2007
@@ -29,18 +29,18 @@
from zope.interface import implements
from flumotion.common import common, errors, interfaces, log
-from flumotion.common import keycards, planet, medium, package
-from flumotion.common import messages, signals, connection
+from flumotion.common import medium
+from flumotion.common import messages, signals
+from flumotion.common import planet, worker # register jelly
+from flumotion.common.messages import N_
from flumotion.configure import configure
from flumotion.twisted import pb as fpb
-# these two imports are for their side effects of jelly type
-# registration
-from flumotion.common import planet, worker
+planet, worker # pyflakes
-from flumotion.common.messages import N_
T_ = messages.gettexter('flumotion')
+
class AdminClientFactory(fpb.ReconnectingFPBClientFactory):
perspectiveInterface = interfaces.IAdminMedium
Modified: flumotion/trunk/flumotion/admin/command/commands.py
==============================================================================
--- flumotion/trunk/flumotion/admin/command/commands.py (original)
+++ flumotion/trunk/flumotion/admin/command/commands.py Fri Dec 21 17:42:00 2007
@@ -23,13 +23,11 @@
import os
from twisted.internet import defer
-from zope.interface import implements
from flumotion.twisted.defer import defer_generator
from flumotion.admin.command import utils
from flumotion.common.planet import moods
from flumotion.common import errors, log, componentui, common
-from flumotion.twisted import flavors
__all__ = ['commands']
Modified: flumotion/trunk/flumotion/admin/command/main.py
==============================================================================
--- flumotion/trunk/flumotion/admin/command/main.py (original)
+++ flumotion/trunk/flumotion/admin/command/main.py Fri Dec 21 17:42:00 2007
@@ -31,12 +31,12 @@
from flumotion.common import log, errors
# make Message proxyable
from flumotion.common import messages
-from flumotion.configure import configure
-from flumotion.twisted import pb as fpb
from flumotion.admin.command.commands import commands
from flumotion.common.options import OptionParser
+messages # pyflakes
+
def err(string):
sys.stderr.write('Error: ' + string + '\n')
sys.exit(1)
Modified: flumotion/trunk/flumotion/admin/command/utils.py
==============================================================================
--- flumotion/trunk/flumotion/admin/command/utils.py (original)
+++ flumotion/trunk/flumotion/admin/command/utils.py Fri Dec 21 17:42:00 2007
@@ -22,7 +22,7 @@
__version__ = "$Rev$"
from flumotion.twisted.defer import defer_generator
-from flumotion.common import componentui, errors
+from flumotion.common import errors
def avatarId(string):
split = string.split('/')
Modified: flumotion/trunk/flumotion/admin/gtk/client.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/client.py (original)
+++ flumotion/trunk/flumotion/admin/gtk/client.py Fri Dec 21 17:42:00 2007
@@ -49,6 +49,8 @@
from flumotion.twisted.pb import Authenticator
from flumotion.ui.trayicon import FluTrayIcon
+admin # pyflakes
+
_ = gettext.gettext
T_ = gettexter('flumotion')
@@ -974,6 +976,7 @@
def _start_shell(self):
if sys.version_info >= (2, 4):
from flumotion.extern import code
+ code # pyflakes
else:
import code
Modified: flumotion/trunk/flumotion/admin/gtk/componentview.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/componentview.py (original)
+++ flumotion/trunk/flumotion/admin/gtk/componentview.py Fri Dec 21 17:42:00 2007
@@ -28,6 +28,7 @@
from flumotion.common import planet, errors, common, log
from flumotion.common import componentui # ensure unjellier registered
+componentui # pyflakes
class NodeBook(gtk.Notebook):
def __init__(self, admingtk):
Modified: flumotion/trunk/flumotion/admin/gtk/main.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/main.py (original)
+++ flumotion/trunk/flumotion/admin/gtk/main.py Fri Dec 21 17:42:00 2007
@@ -26,7 +26,7 @@
import gettext
-from twisted.internet import reactor, defer
+from twisted.internet import reactor
from twisted.python import log as twistedlog
from flumotion.admin import connections
Modified: flumotion/trunk/flumotion/admin/multi.py
==============================================================================
--- flumotion/trunk/flumotion/admin/multi.py (original)
+++ flumotion/trunk/flumotion/admin/multi.py Fri Dec 21 17:42:00 2007
@@ -24,8 +24,7 @@
from twisted.internet import defer
-from flumotion.twisted import pb as fpb
-from flumotion.common import log, planet, connection, errors, startset
+from flumotion.common import log, planet, errors, startset
from flumotion.admin import admin
@@ -115,12 +114,12 @@
self._managerDisconnected))
self._reconnectHandlerIds[admin.managerId] = admin, ids
- planet = admin.planet
+ adminplanet = admin.planet
self.info('Connected to manager %s (planet %s)',
- admin.managerId, planet.get('name'))
+ admin.managerId, adminplanet.get('name'))
assert admin.managerId not in self.admins
self.admins[admin.managerId] = admin
- self.emit('addPlanet', admin, planet)
+ self.emit('addPlanet', admin, adminplanet)
def _managerDisconnected(self, admin):
if admin.managerId in self.admins:
Modified: flumotion/trunk/flumotion/admin/rrdmon/config.py
==============================================================================
--- flumotion/trunk/flumotion/admin/rrdmon/config.py (original)
+++ flumotion/trunk/flumotion/admin/rrdmon/config.py Fri Dec 21 17:42:00 2007
@@ -23,9 +23,6 @@
import os
-from xml.dom import Node
-
-from flumotion.configure import configure
from flumotion.common import common, config, connection
from flumotion.common.errors import ConfigError
Modified: flumotion/trunk/flumotion/admin/rrdmon/main.py
==============================================================================
--- flumotion/trunk/flumotion/admin/rrdmon/main.py (original)
+++ flumotion/trunk/flumotion/admin/rrdmon/main.py Fri Dec 21 17:42:00 2007
@@ -27,10 +27,8 @@
from twisted.internet import reactor
from flumotion.configure import configure
-from flumotion.common import log, keycards, common, errors
-from flumotion.common import connection
+from flumotion.common import log, common
from flumotion.admin.rrdmon import rrdmon, config
-from flumotion.twisted import pb
from flumotion.common.options import OptionGroup, OptionParser
# more standard helper functions necessary...
Modified: flumotion/trunk/flumotion/admin/rrdmon/rrdmon.py
==============================================================================
--- flumotion/trunk/flumotion/admin/rrdmon/rrdmon.py (original)
+++ flumotion/trunk/flumotion/admin/rrdmon/rrdmon.py Fri Dec 21 17:42:00 2007
@@ -28,8 +28,6 @@
import datetime
import time
-from dateutil import rrule
-
from flumotion.admin import multi
from flumotion.common import log, common
from flumotion.component.base import scheduler
@@ -37,6 +35,7 @@
# register the unjellyable
from flumotion.common import componentui
+componentui # pyflakes
"""RRD resource poller daemon for Flumotion.
Modified: flumotion/trunk/flumotion/admin/text/admin_text.py
==============================================================================
--- flumotion/trunk/flumotion/admin/text/admin_text.py (original)
+++ flumotion/trunk/flumotion/admin/text/admin_text.py Fri Dec 21 17:42:00 2007
@@ -23,7 +23,7 @@
from zope.interface import implements
-from flumotion.common import errors, log
+from flumotion.common import log
from flumotion.twisted import flavors
class BaseAdminText(log.Loggable):
Modified: flumotion/trunk/flumotion/admin/text/connection.py
==============================================================================
--- flumotion/trunk/flumotion/admin/text/connection.py (original)
+++ flumotion/trunk/flumotion/admin/text/connection.py Fri Dec 21 17:42:00 2007
@@ -25,7 +25,6 @@
from flumotion.admin.admin import AdminModel
from flumotion.admin.text.view import AdminTextView
-from flumotion.twisted import flavors, reflect, pb as fpb
from flumotion.common import errors
from twisted.internet import reactor
Modified: flumotion/trunk/flumotion/admin/text/greeter.py
==============================================================================
--- flumotion/trunk/flumotion/admin/text/greeter.py (original)
+++ flumotion/trunk/flumotion/admin/text/greeter.py Fri Dec 21 17:42:00 2007
@@ -25,7 +25,7 @@
from flumotion.admin import connections
from flumotion.common import log, connection as fconnection
-from flumotion.twisted import flavors, reflect, pb as fpb
+from flumotion.twisted import flavors, pb as fpb
from flumotion.admin.text import misc_curses
from flumotion.admin.text import connection
Modified: flumotion/trunk/flumotion/admin/text/main.py
==============================================================================
--- flumotion/trunk/flumotion/admin/text/main.py (original)
+++ flumotion/trunk/flumotion/admin/text/main.py Fri Dec 21 17:42:00 2007
@@ -21,24 +21,16 @@
__version__ = "$Rev$"
-from twisted.internet import reactor
-from twisted.python import rebuild
-
-from flumotion.common import log, errors, worker, planet, common
-from flumotion.common.options import OptionGroup, OptionParser
-
-# make Message proxyable
-from flumotion.common import messages
-
-from flumotion.configure import configure
-from flumotion.twisted import flavors, reflect
+import curses
-#from flumotion.admin import connections
+from twisted.internet import reactor
from flumotion.admin.text import connection
from flumotion.admin.text.greeter import AdminTextGreeter
+from flumotion.common import messages # make Message proxyable
+from flumotion.common.options import OptionParser
-import curses
+messages # pyflakes
def cleanup_curses(stdscr):
curses.nocbreak()
Modified: flumotion/trunk/flumotion/admin/text/view.py
==============================================================================
--- flumotion/trunk/flumotion/admin/text/view.py (original)
+++ flumotion/trunk/flumotion/admin/text/view.py Fri Dec 21 17:42:00 2007
@@ -30,9 +30,7 @@
from twisted.python import rebuild
from zope.interface import implements
-from flumotion.admin.admin import AdminModel
-from flumotion.common import log, errors, worker, planet, common
-from flumotion.configure import configure
+from flumotion.common import log, errors, common
from flumotion.twisted import flavors, reflect
from flumotion.common.planet import moods
More information about the flumotion-commit
mailing list