Merge lp:~terrycojones/tickery/fix-pep8-798273 into lp:tickery

[Terry Jones]

Tons of simple edits to clean up pep8 complaints.

[Esteve Fernandez (esteve)]

+1 I reviewed every single line of the 2K diff and it looks good to me.

review: Approve

=== modified file 'bin/create-twitter-namespaces-and-tags.py'
--- bin/create-twitter-namespaces-and-tags.py	2011-06-14 20:36:36 +0000
+++ bin/create-twitter-namespaces-and-tags.py	2011-06-16 16:17:19 +0000
@@ -38,6 +38,7 @@
     print msg
     return result
 
+
 def ignorePreexistingErrror(failure, msg):
     failure.trap(error.Error)
     if int(failure.value.status) == http.PRECONDITION_FAILED:
@@ -45,10 +46,12 @@
     else:
         return failure
 
+
 def addCallbacks(d, msg):
     d.addCallbacks(report, ignorePreexistingErrror,
                    callbackArgs=(msg,), errbackArgs=(msg,))
 
+
 @defer.inlineCallbacks
 def create(endpoint):
     ns = Namespace(TWITTER_USERNAME)

=== modified file 'bin/print-caches.py'
--- bin/print-caches.py	2010-07-20 09:47:02 +0000
+++ bin/print-caches.py	2011-06-16 16:17:19 +0000
@@ -16,8 +16,9 @@
 
 from tickery.cache import TickeryCache
 
+
 def printHeader(what):
-    print '\n%s[ %s ]%s' %  ('-' * 5, what, '-' * (70 - len(what)))
+    print '\n%s[ %s ]%s' % ('-' * 5, what, '-' * (70 - len(what)))
 
 
 if __name__ == '__main__':

=== modified file 'doc/conf.py'
--- doc/conf.py	2011-06-14 20:49:53 +0000
+++ doc/conf.py	2011-06-16 16:17:19 +0000
@@ -62,7 +62,8 @@
 # for source files.
 exclude_trees = ['_build']
 
-# The reST default role (used for this markup: `text`) to use for all documents.
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
 #default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -83,7 +84,7 @@
 #modindex_common_prefix = []
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
@@ -157,7 +158,7 @@
 htmlhelp_basename = 'fluidDBdoc'
 
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output ------------------------------------------------
 
 # The paper size ('letter' or 'a4').
 #latex_paper_size = 'letter'
@@ -166,7 +167,8 @@
 #latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
+# (source start file, target name, title, author, documentclass
+# [howto/manual]).
 latex_documents = [
   ('index', 'tickery.tex', u'Tickery Docs',
    u'Fluidinfo Ltd', 'manual'),

=== modified file 'tickery/adder.py'
--- tickery/adder.py	2011-06-14 20:36:36 +0000
+++ tickery/adder.py	2011-06-16 16:17:19 +0000
@@ -29,11 +29,11 @@
     _states = ('queued', 'underway', 'added', 'canceled', 'failed')
 
     _illegalTransitions = {
-        'queued'    : ('added', 'failed'),
-        'underway'  : ('queued',),
-        'added'     : ('queued', 'underway', 'canceled', 'failed'),
-        'canceled' : ('underway', 'added', 'failed'),
-        'failed'    : ('underway', 'added'),
+        'queued': ('added', 'failed'),
+        'underway': ('queued',),
+        'added': ('queued', 'underway', 'canceled', 'failed'),
+        'canceled': ('underway', 'added', 'failed'),
+        'failed': ('underway', 'added'),
         }
 
     def __init__(self, screenname, nFriends):
@@ -88,7 +88,8 @@
 
     def __repr__(self):
         return '<%s screenname=%r state=%r nFriends=%d>' % (
-            self.__class__.__name__, self.screenname, self.state, self.nFriends)
+            self.__class__.__name__, self.screenname, self.state,
+            self.nFriends)
 
 
 class AdderCache(DumpingCache):
@@ -130,7 +131,7 @@
                     self.clean = False
 
     def __str__(self):
-        s = [ '%d users in adder cache' % len(self.users) ]
+        s = ['%d users in adder cache' % len(self.users)]
         for key in sorted(self.users.keys()):
             s.append(str(self.users[key]))
         return '\n'.join(s)
@@ -153,6 +154,7 @@
             user.setState('added')
             self.clean = False
             return result
+
         def _failed(fail):
             self.clean = False
             if fail.check(ftwitter.Canceled):
@@ -162,6 +164,7 @@
             else:
                 user.setState('failed')
                 log.msg('Failed to add %r: %s' % (user.screenname, fail))
+
         log.msg('User %r received from request queue.' % user.screenname)
         user.setState('underway')
         d = ftwitter.addUserByScreenname(self.cache, self.endpoint, user)
@@ -179,7 +182,8 @@
             if user.state == 'underway':
                 for item in self.rdq.underway():
                     if item.job.screenname == screenname:
-                        log.msg('Cancelling underway %r addition.' % screenname)
+                        log.msg('Cancelling underway %r addition.' %
+                                screenname)
                         item.cancel()
                         user.setState('canceled')
                         break
@@ -254,12 +258,12 @@
                             (screenname, state))
 
         return {
-            'queued' : queued,
-            'underway' : underway,
-            'added' : added, # NB: 'added' is referred to in ftwitter.py
-            'failed' : failed,
-            'canceled' : canceled,
-            'unknown' : unknown,
+            'queued': queued,
+            'underway': underway,
+            'added': added,  # NB: 'added' is referred to in ftwitter.py
+            'failed': failed,
+            'canceled': canceled,
+            'unknown': unknown,
             }
 
     @defer.inlineCallbacks

=== modified file 'tickery/admin/index.py'
--- tickery/admin/index.py	2011-06-14 20:36:36 +0000
+++ tickery/admin/index.py	2011-06-16 16:17:19 +0000
@@ -18,8 +18,16 @@
 from pyjamas.ui.Label import Label
 from pyjamas.ui.Image import Image
 
-import width, size, friends, results, directadd, pause
-import underway, queued, requests, cancel
+import width
+import size
+import friends
+import results
+import directadd
+import pause
+import underway
+import queued
+import requests
+import cancel
 
 
 class Admin(VerticalPanel):

=== modified file 'tickery/admin/size.py'
--- tickery/admin/size.py	2010-07-20 09:47:02 +0000
+++ tickery/admin/size.py	2011-06-16 16:17:19 +0000
@@ -18,7 +18,9 @@
 
 import server
 
+
 class QueueSize(HorizontalPanel):
+
     def __init__(self):
         HorizontalPanel.__init__(self, Spacing=4)
         self.add(Label('Queue size:', StyleName='section'))

=== modified file 'tickery/api.py'
--- tickery/api.py	2011-06-14 20:36:36 +0000
+++ tickery/api.py	2011-06-16 16:17:19 +0000
@@ -15,6 +15,7 @@
 from twisted.python import log
 from twisted.web import server, resource, error, http
 
+
 def _returnUID(obj, request):
     uid = str(obj.uuid)
     request.setHeader('Content-length', str(len(uid)))
@@ -22,6 +23,7 @@
     request.write(uid)
     request.finish()
 
+
 def _error(failure, request):
     if failure.check(error.Error):
         code = int(failure.value.status)

=== modified file 'tickery/cache.py'
--- tickery/cache.py	2011-06-14 20:36:36 +0000
+++ tickery/cache.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,8 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import os, functools
+import os
+import functools
 
 from twisted.internet import defer
 from twisted.application import service

=== modified file 'tickery/cacheutils.py'
--- tickery/cacheutils.py	2011-06-14 20:36:36 +0000
+++ tickery/cacheutils.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,8 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import os, cPickle as pickle
+import os
+import cPickle as pickle
 
 from twisted.python import log
 # xxx: from twisted.internet import task

=== modified file 'tickery/endpoint.py'
--- tickery/endpoint.py	2010-07-20 09:47:02 +0000
+++ tickery/endpoint.py	2011-06-16 16:17:19 +0000
@@ -18,6 +18,7 @@
 
 from tickery.www.defaults import TWITTER_USERNAME, TWITTER_PASSWORD_VAR
 
+
 def twitterPassword():
     try:
         return os.environ[TWITTER_PASSWORD_VAR]
@@ -25,6 +26,7 @@
         raise Exception('Please set %r in your environment.' %
                         TWITTER_PASSWORD_VAR)
 
+
 def twitterEndpoint(URL):
     return Endpoint(baseURL=URL,
                     creds=BasicCreds(TWITTER_USERNAME, twitterPassword()))

=== modified file 'tickery/error.py'
--- tickery/error.py	2010-07-20 09:47:02 +0000
+++ tickery/error.py	2011-06-16 16:17:19 +0000
@@ -12,5 +12,6 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
+
 class NoSuchCookie(Exception):
     pass

=== modified file 'tickery/friendscache.py'
--- tickery/friendscache.py	2011-06-14 20:36:36 +0000
+++ tickery/friendscache.py	2011-06-16 16:17:19 +0000
@@ -42,7 +42,7 @@
             return d
 
     def __str__(self):
-        s = [ '%d names in friends cache' % len(self._friends) ]
+        s = ['%d names in friends cache' % len(self._friends)]
         for key in sorted(self._friends.keys()):
             s.append('%s: nFriends=%s' % (key, len(self._friends[key])))
         return '\n'.join(s)

=== modified file 'tickery/ftwitter.py'
--- tickery/ftwitter.py	2011-06-14 20:36:36 +0000
+++ tickery/ftwitter.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,8 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import time, urllib
+import time
+import urllib
 
 from twisted.internet import defer, task
 from twisted.python import log, failure
@@ -40,9 +41,9 @@
 
 # Put this into www/defaults and re-org stuff in www/*.py in another branch.
 tabName = {
-    'simple' : 'simple',
-    'intermediate' : 'intermediate',
-    'advanced' : 'advanced',
+    'simple': 'simple',
+    'intermediate': 'intermediate',
+    'advanced': 'advanced',
     }
 
 _hashTag = '#tickery'
@@ -74,24 +75,59 @@
 # The Twitter tags we additionally add to user objects. There are several
 # others we could add to this.
 extraTags = {
-    TWITTER_N_FRIENDS_TAG_NAME : nFriendsTag,
-    TWITTER_N_FOLLOWERS_TAG_NAME : nFollowersTag,
-    TWITTER_N_STATUSES_TAG_NAME : nStatusesTag,
+    TWITTER_N_FRIENDS_TAG_NAME: nFriendsTag,
+    TWITTER_N_FOLLOWERS_TAG_NAME: nFollowersTag,
+    TWITTER_N_STATUSES_TAG_NAME: nStatusesTag,
     }
 
 
-class UnknownScreenname(Exception): pass
-class UnaddedScreennames(Exception): pass
-class ScreennameErrors(Exception): pass
-class NonExistentScreennames(Exception): pass
-class ProtectedScreenname(Exception): pass
-class ProtectedScreennames(Exception): pass
-class TooManyFriends(Exception): pass
-class FluidDBParseError(Exception): pass
-class FluidDBNonexistentAttribute(Exception): pass
-class FluidDBPermissionDenied(Exception): pass
-class FluidDBError(Exception): pass
-class Canceled(Exception): pass
+class UnknownScreenname(Exception):
+    pass
+
+
+class UnaddedScreennames(Exception):
+    pass
+
+
+class ScreennameErrors(Exception):
+    pass
+
+
+class NonExistentScreennames(Exception):
+    pass
+
+
+class ProtectedScreenname(Exception):
+    pass
+
+
+class ProtectedScreennames(Exception):
+    pass
+
+
+class TooManyFriends(Exception):
+    pass
+
+
+class FluidDBParseError(Exception):
+    pass
+
+
+class FluidDBNonexistentAttribute(Exception):
+    pass
+
+
+class FluidDBPermissionDenied(Exception):
+    pass
+
+
+class FluidDBError(Exception):
+    pass
+
+
+class Canceled(Exception):
+    pass
+
 
 def _ignoreHTTPStatus(fail, status):
     fail.trap(error.Error)
@@ -282,6 +318,7 @@
 
     userJob.workDone = userJob.workToDo
 
+
 def friendOf(cache, endpoint, screenname1, screenname2):
     # Does the object for the user screenname2 have a screenname1
     # follows tag on it?
@@ -306,13 +343,16 @@
     d.addErrback(filter404)
     return d
 
+
 def intermediateQuery(cache, endpoint, queryTree):
     screennames = set()
     query.queryTreeExtractScreennames(queryTree, screennames)
     d = cache.userCache.usersByScreennames(screennames)
-    d.addCallback(cb_intermediateQuery, screennames, cache, endpoint, queryTree)
+    d.addCallback(cb_intermediateQuery, screennames, cache, endpoint,
+                  queryTree)
     return d
 
+
 def cb_intermediateQuery(users, screennames, cache, endpoint, queryTree):
     # Make sure all users exist, that there were no other errors in
     # fetching them, and that none of them are protected.
@@ -341,9 +381,9 @@
     # Make sure to use defaults.FRIENDS_LIMIT here, not to import
     # that value. That's because we can change the value (in the
     # defaults module) using the admin interface.
-    tooMany =  [(name, users[name]['friends_count']) for name in users if
-                (users[name]['friends_count'] > defaults.FRIENDS_LIMIT and
-                 not cache.adderCache.added(name))]
+    tooMany = [(name, users[name]['friends_count']) for name in users if
+               (users[name]['friends_count'] > defaults.FRIENDS_LIMIT and
+                not cache.adderCache.added(name))]
     if tooMany:
         raise TooManyFriends(tooMany)
 
@@ -380,11 +420,12 @@
         return defer.succeed(result)
 
 _fluidDBErrors = {
-    'TParseError' : FluidDBParseError,
-    'TPathPermissionDenied' : FluidDBPermissionDenied,
-    'TNonexistentAttribute' : FluidDBNonexistentAttribute,
+    'TParseError': FluidDBParseError,
+    'TPathPermissionDenied': FluidDBPermissionDenied,
+    'TNonexistentAttribute': FluidDBNonexistentAttribute,
     }
 
+
 def _queryErr(fail, query):
     fail.trap(error.Error)
     errorClass = fail.value.response_headers.get('x-fluiddb-error-class')
@@ -399,16 +440,19 @@
         log.msg('Error Class %r' % (errorClass,))
         raise _fluidDBErrors[errorClass]()
     except KeyError:
-        log.msg('Unhandled Fluiddb error class %r Query %r got HTTP status %s' %
+        log.msg('Unhandled Fluiddb error class %r Query %r got '
+                'HTTP status %s' %
                 (errorClass, query, fail.value.status))
         raise FluidDBError()
 
+
 def fluidDBQuery(endpoint, query):
     d = Object.query(endpoint, query)
     d.addCallback(lambda results: [r.uuid for r in results])
     d.addErrback(_queryErr, query)
     return d
 
+
 def simpleTweetURL(screennames, sortKey):
     return '%s?tab=%s&name1=%s&name2=%s&sort=%s' % (
         TICKERY_URL, tabName['simple'],
@@ -416,6 +460,7 @@
         urllib.quote(screennames[1].encode('utf-8')),
         sortKey)
 
+
 def simpleUpdate(cookie, cookieDict, screennames, nUsers, sortKey, useAtSigns):
     for i, name in enumerate(screennames):
         if useAtSigns:
@@ -435,9 +480,12 @@
         text = '%s %s' % (basic, url)
     return twitter.updateStatus(text, cookie, cookieDict)
 
+
 def tweetURL(query, tabName, sortKey):
     return '%s?tab=%s&query=%s&sort=%s' % (
-        TICKERY_URL, tabName, urllib.quote_plus(query.encode('utf-8')), sortKey)
+        TICKERY_URL, tabName, urllib.quote_plus(query.encode('utf-8')),
+        sortKey)
+
 
 def update(cookie, cookieDict, text, query, tabName, sortKey):
     url = tweetURL(query, tabName, sortKey)
@@ -447,6 +495,7 @@
         text = '%s %s' % (text, url)
     return twitter.updateStatus(text, cookie, cookieDict)
 
+
 def _lookupCookie(cookie, cache, fname):
     try:
         return cache.cookieCache[cookie]
@@ -454,6 +503,7 @@
         log.err('%s: Could not find cookie %r.' % (fname, cookie))
         raise terror.NoSuchCookie()
 
+
 def follow(cookie, cache, endpoint, uid):
     user, _ = _lookupCookie(cookie, cache, 'follow')
     tag = Tag(TWITTER_USERNAME, TWITTER_FRIENDS_NAMESPACE_NAME,
@@ -465,6 +515,7 @@
     d.addErrback(_ignoreHTTPStatus, http.NOT_FOUND)
     return d
 
+
 def unfollow(cookie, cache, endpoint, uid):
     user, _ = _lookupCookie(cookie, cache, 'unfollow')
     tag = Tag(TWITTER_USERNAME, TWITTER_FRIENDS_NAMESPACE_NAME,
@@ -476,6 +527,7 @@
     d.addErrback(_ignoreHTTPStatus, http.NOT_FOUND)
     return d
 
+
 def friendsIdFetcher(cookie, cache, screenname):
     # Note: only use the friends cache if the user is not protected. That's
     # because the cache only contains public users, to prevent people who
@@ -493,6 +545,7 @@
         d = cache.friendsIdCache[screenname]
     return d
 
+
 @defer.inlineCallbacks
 def directAddUser(cache, screenname):
     # Make sure the user exists, that there are no errors in fetching them,
@@ -516,6 +569,7 @@
         else:
             cache.adderCache.put(screenname, user['friends_count'])
 
+
 @defer.inlineCallbacks
 def bulkAddUsers(cache, screennames):
     # Add all users. Return a list of error messages.
@@ -542,6 +596,7 @@
                 cache.adderCache.put(screenname, user['friends_count'])
     defer.returnValue(errs)
 
+
 def addExtraTwitterTags(endpoint, userObject, user):
     # Add additional Twitter info tags to the user's object. We do this
     # asynchronously, and all taggings are launched at once (not

=== modified file 'tickery/login.py'
--- tickery/login.py	2010-07-20 09:47:02 +0000
+++ tickery/login.py	2011-06-16 16:17:19 +0000
@@ -19,6 +19,7 @@
 from tickery.www import defaults
 from tickery.looper import RetryingCall
 
+
 def getTwitterOAuthURL(oauthTokenDict):
     log.msg('Got login URL request.')
 

=== modified file 'tickery/looper.py'
--- tickery/looper.py	2011-06-14 20:36:36 +0000
+++ tickery/looper.py	2011-06-16 16:17:19 +0000
@@ -19,6 +19,7 @@
 from twisted.internet import reactor, defer, task
 from twisted.python import log, failure
 
+
 def simpleBackoffIterator(maxResults=10, maxDelay=120.0, now=True,
                           initDelay=0.01, incFunc=None):
     assert maxResults > 0
@@ -99,7 +100,8 @@
             d.addCallbacks(self._deferred.callback, self._err)
 
     def start(self, backoffIterator=None, failureTester=None):
-        self._backoffIterator = iter(backoffIterator or simpleBackoffIterator())
+        self._backoffIterator = iter(backoffIterator or
+                                     simpleBackoffIterator())
         self._failureTester = failureTester or (lambda _: None)
         self._deferred = defer.Deferred()
         self.failure = None

=== modified file 'tickery/oauth.py'
--- tickery/oauth.py	2011-06-14 20:49:53 +0000
+++ tickery/oauth.py	2011-06-16 16:17:19 +0000
@@ -34,7 +34,7 @@
 import binascii
 
 
-VERSION = '1.0' # Hi Blaine!
+VERSION = '1.0'  # Hi Blaine!
 HTTP_METHOD = 'GET'
 SIGNATURE_METHOD = 'PLAINTEXT'
 
@@ -44,14 +44,17 @@
     def __init__(self, message='OAuth error occured.'):
         self.message = message
 
+
 def build_authenticate_header(realm=''):
     """Optional WWW-Authenticate header (401 error)"""
     return {'WWW-Authenticate': 'OAuth realm="%s"' % realm}
 
+
 def escape(s):
     """Escape a URL including any /."""
     return urllib.quote(s, safe='~')
 
+
 def _utf8_str(s):
     """Convert unicode to utf-8."""
     if isinstance(s, unicode):
@@ -59,14 +62,17 @@
     else:
         return str(s)
 
+
 def generate_timestamp():
     """Get seconds since epoch (UTC)."""
     return int(time.time())
 
+
 def generate_nonce(length=8):
     """Generate pseudorandom number."""
     return ''.join([str(random.randint(0, 9)) for i in range(length)])
 
+
 def generate_verifier(length=8):
     """Generate pseudorandom number."""
     return ''.join([str(random.randint(0, 9)) for i in range(length)])
@@ -88,8 +94,8 @@
 
 
 class OAuthToken(object):
-    """OAuthToken is a data type that represents an End User via either an access
-    or request token.
+    """OAuthToken is a data type that represents an End User via either an
+    access or request token.
 
     key -- the token
     secret -- the token secret
@@ -148,7 +154,7 @@
         try:
             token.callback_confirmed = params['oauth_callback_confirmed'][0]
         except KeyError:
-            pass # 1.0, no callback confirmed.
+            pass  # 1.0, no callback confirmed.
         return token
     from_string = staticmethod(from_string)
 
@@ -170,12 +176,13 @@
         - oauth_verifier
         ... any additional parameters, as defined by the Service Provider.
     """
-    parameters = None # OAuth parameters.
+    parameters = None  # OAuth parameters.
     http_method = HTTP_METHOD
     http_url = None
     version = VERSION
 
-    def __init__(self, http_method=HTTP_METHOD, http_url=None, parameters=None):
+    def __init__(self, http_method=HTTP_METHOD, http_url=None,
+                 parameters=None):
         self.http_method = http_method
         self.http_url = http_url
         self.parameters = parameters or {}
@@ -231,7 +238,7 @@
             pass
         # Escape key values before sorting.
         key_values = [(escape(_utf8_str(k)), escape(_utf8_str(v))) \
-            for k,v in params.items()]
+            for k, v in params.items()]
         # Sort lexicographically, first after key, then after value.
         key_values.sort()
         # Combine key value pairs into a string.
@@ -291,7 +298,7 @@
             parameters.update(query_params)
 
         # URL parameters.
-        param_str = urlparse.urlparse(http_url)[4] # query
+        param_str = urlparse.urlparse(http_url)[4]  # query
         url_params = OAuthRequest._split_url_string(param_str)
         parameters.update(url_params)
 
@@ -369,9 +376,10 @@
         return parameters
     _split_url_string = staticmethod(_split_url_string)
 
+
 class OAuthServer(object):
     """A worker to check the validity of a request against a data store."""
-    timestamp_threshold = 300 # In seconds, five minutes.
+    timestamp_threshold = 300  # In seconds, five minutes.
     version = VERSION
     signature_methods = None
     data_store = None
@@ -404,7 +412,7 @@
             try:
                 callback = self.get_callback(oauth_request)
             except OAuthError:
-                callback = None # 1.0, no callback specified.
+                callback = None  # 1.0, no callback specified.
             self._check_signature(oauth_request, consumer, None)
             # Fetch a new token.
             token = self.data_store.fetch_request_token(consumer, callback)
@@ -423,7 +431,8 @@
         # Get the request token.
         token = self._get_token(oauth_request, 'request')
         self._check_signature(oauth_request, consumer, token)
-        new_token = self.data_store.fetch_access_token(consumer, token, verifier)
+        new_token = self.data_store.fetch_access_token(
+            consumer, token, verifier)
         return new_token
 
     def verify_request(self, oauth_request):
@@ -471,8 +480,8 @@
             signature_method = self.signature_methods[signature_method]
         except:
             signature_method_names = ', '.join(self.signature_methods.keys())
-            raise OAuthError('Signature method %s not supported try one of the '
-                'following: %s' % (signature_method, signature_method_names))
+            raise OAuthError('Signature method %s not supported try one of the'
+                ' following: %s' % (signature_method, signature_method_names))
 
         return signature_method
 
@@ -488,7 +497,8 @@
         token_field = oauth_request.get_parameter('oauth_token')
         token = self.data_store.lookup_token(token_type, token_field)
         if not token:
-            raise OAuthError('Invalid %s token: %s' % (token_type, token_field))
+            raise OAuthError('Invalid %s token: %s' % (
+                token_type, token_field))
         return token
 
     def _get_verifier(self, oauth_request):
@@ -592,7 +602,8 @@
         """-> str."""
         raise NotImplementedError
 
-    def build_signature_base_string(self, oauth_request, oauth_consumer, oauth_token):
+    def build_signature_base_string(self, oauth_request, oauth_consumer,
+                                    oauth_token):
         """-> str key, str raw."""
         raise NotImplementedError
 
@@ -630,10 +641,10 @@
 
         # HMAC object.
         try:
-            import hashlib # 2.5
+            import hashlib  # 2.5
             hashed = hmac.new(key, raw, hashlib.sha1)
         except:
-            import sha # Deprecated
+            import sha  # Deprecated
             hashed = hmac.new(key, raw, sha)
 
         # Calculate the digest base 64.

=== modified file 'tickery/oidcache.py'
--- tickery/oidcache.py	2011-06-14 20:36:36 +0000
+++ tickery/oidcache.py	2011-06-16 16:17:19 +0000
@@ -55,7 +55,7 @@
                     self.screennameToObjectId[item.screenname.lower()] = oid
 
     def __str__(self):
-        s = [ '%d oids in oid/uid/name cache' % len(self.objectIdToItem) ]
+        s = ['%d oids in oid/uid/name cache' % len(self.objectIdToItem)]
         for key in sorted(self.objectIdToItem.keys()):
             s.append('%s: %s' % (key, self.objectIdToItem[key]))
         return '\n'.join(s)

=== modified file 'tickery/query.py'
--- tickery/query.py	2011-06-14 20:36:36 +0000
+++ tickery/query.py	2011-06-16 16:17:19 +0000
@@ -14,17 +14,26 @@
 
 import ply.lex as lex
 import ply.yacc as yacc
-import re, sys
-
-class QueryError(Exception): pass
-class UnparseableError(QueryError): pass
+import re
+import sys
+
+
+class QueryError(Exception):
+    pass
+
+
+class UnparseableError(QueryError):
+    pass
+
 
 class TokenError(QueryError):
+
     def __init__(self, t):
         Exception.__init__(self)
         self.value = t.value
         self.offset = t.lexpos
 
+
 class QueryLexer(object):
 
     # Ignore whitespace
@@ -44,8 +53,8 @@
 
     reserved = (u'and', u'or', u'except')
 
-    t_LPAREN  = '\('
-    t_RPAREN  = '\)'
+    t_LPAREN = '\('
+    t_RPAREN = '\)'
 
     def t_EXCEPTSYM(self, t):
         r'-'
@@ -178,6 +187,7 @@
         except RuntimeError:
             raise UnparseableError()
 
+
 def queryTreeToString(queryTree, fdbUsername, fdbNamespace):
     """Return a query string that can be sent to FluidDB. Note that we turn
     all screennames into lowercase in the complete tag names. That's
@@ -203,6 +213,7 @@
     else:
         raise Exception('WTF? Node type is %r' % (nodeType,))
 
+
 def queryTreeExtractScreennames(queryTree, screennames):
     """Pull all the screennames out of a query tree. Do this in a
     case-insensitive way. Return a set of names that preserves case (first

=== modified file 'tickery/querycache.py'
--- tickery/querycache.py	2011-06-14 20:36:36 +0000
+++ tickery/querycache.py	2011-06-16 16:17:19 +0000
@@ -29,7 +29,7 @@
             self._queries, self._screennameIndex = data
 
     def __str__(self):
-        s = [ '%d queries in cache' % len(self._queries) ]
+        s = ['%d queries in cache' % len(self._queries)]
         for key in sorted(self._queries.keys()):
             s.append('size %4d: %s' % (len(self._queries[key]), key))
         return '\n'.join(s)
@@ -43,7 +43,7 @@
             try:
                 self._screennameIndex[screenname].append(query)
             except KeyError:
-                self._screennameIndex[screenname] = [ query ]
+                self._screennameIndex[screenname] = [query]
         self.clean = False
 
     def invalidate(self, screenname):

=== modified file 'tickery/service.py'
--- tickery/service.py	2011-06-14 20:36:36 +0000
+++ tickery/service.py	2011-06-16 16:17:19 +0000
@@ -24,14 +24,16 @@
 from tickery.www import defaults
 
 
-class TooManyResults(Exception): pass
+class TooManyResults(Exception):
+    pass
+
 
 screennameListErrors = {
-    ftwitter.NonExistentScreennames : 'nonexistent',
-    ftwitter.ScreennameErrors : 'othererror',
-    ftwitter.ProtectedScreennames : 'protected',
-    ftwitter.TooManyFriends : 'toomany',
-    TooManyResults : 'toomanyresults',
+    ftwitter.NonExistentScreennames: 'nonexistent',
+    ftwitter.ScreennameErrors: 'othererror',
+    ftwitter.ProtectedScreennames: 'protected',
+    ftwitter.TooManyFriends: 'toomany',
+    TooManyResults: 'toomanyresults',
     }
 
 _noScreenname = '<None>'
@@ -46,12 +48,12 @@
         self.ASTBuilder = ASTBuilder()
 
     def jsonrpc_nUsers(self):
-        return {'result' : self.cache.oidUidScreennameCache.nUsers()}
+        return {'result': self.cache.oidUidScreennameCache.nUsers()}
 
     def jsonrpc_spideredScreennames(self, *screennames):
         log.msg('spideredScreenname called with %r.' % (screennames,))
-        return { 'result' :
-                 [ self.cache.adderCache.added(s) for s in screennames ]}
+        return {'result':
+                [self.cache.adderCache.added(s) for s in screennames]}
 
     def _objectIdsToUsers(self, (users, ids)):
         '''Convert a list of FluidDB object ids to a JSON RPC result dict
@@ -59,16 +61,16 @@
         if ids:
             log.err('Unexpected object ids matched query: %r' % (ids,))
         return {
-            'result' : {
-                'result' : True,
-                'users' : users}}
+            'result': {
+                'result': True,
+                'users': users}}
 
     def _objectIdsToUsersWherePossible(self, (users, ids)):
         return {
-            'result' : {
-                'result' : True,
-                'users' : users,
-                'objectIds' : ids}}
+            'result': {
+                'result': True,
+                'users': users,
+                'objectIds': ids}}
 
     def jsonrpc_friendOf(self, screenname1, screenname2):
         # Return True if screenname1 follows screenname2 (i.e., screenname2
@@ -76,7 +78,7 @@
         log.msg('FriendOf %r and %r.' % (screenname1, screenname2))
         d = ftwitter.friendOf(self.cache, self.endpoint,
                               screenname1, screenname2)
-        d.addCallback(lambda result: { 'result' : result })
+        d.addCallback(lambda result: {'result': result})
         d.addErrback(log.err)
         return d
 
@@ -93,9 +95,9 @@
     def _screennameListError(self, fail):
         listErr = fail.trap(*screennameListErrors.keys())
         result = {
-            'result' : {
-                'result' : False,
-                screennameListErrors[listErr] : list(fail.value.args[0]),
+            'result': {
+                'result': False,
+                screennameListErrors[listErr]: list(fail.value.args[0]),
                 }
             }
         # Add the current friends limit if we have that kind of error.
@@ -108,9 +110,9 @@
     def _unaddedError(self, fail):
         fail.trap(ftwitter.UnaddedScreennames)
         return {
-            'result' : {
-                'result' : False,
-                'unadded' : fail.value.args[0],
+            'result': {
+                'result': False,
+                'unadded': fail.value.args[0],
                 }
             }
 
@@ -122,28 +124,30 @@
         else:
             screenname = data[0]['screen_name']
 
-        log.msg('QUERY: tab=%s user=%r query=%r' % (tabName, screenname, query))
+        log.msg('QUERY: tab=%s user=%r query=%r' % (
+            tabName, screenname, query))
 
         try:
             parseTree = self.ASTBuilder.build(query)
         except TokenError, p:
             log.msg('User %r sent malformed query %r' % (screenname, query))
             return {
-                'result' : {
-                    'result' : False,
-                    'value' : p.value,
-                    'offset' : p.offset,
+                'result': {
+                    'result': False,
+                    'value': p.value,
+                    'offset': p.offset,
                     }
                 }
         except UnparseableError:
             log.msg('User %r sent unparsable query %r' % (screenname, query))
             return {
-                'result' : {
-                    'result' : False,
+                'result': {
+                    'result': False,
                     }
                 }
         else:
-            d = ftwitter.intermediateQuery(self.cache, self.endpoint, parseTree)
+            d = ftwitter.intermediateQuery(
+                self.cache, self.endpoint, parseTree)
             d.addCallback(self._checkTooManyResults)
             d.addCallback(
                 self.cache.oidUidScreennameCache.objectIdsToUsers,
@@ -166,9 +170,9 @@
         else:
             errorClass = err.__name__
         return {
-            'result' : {
-                'result' : False,
-                'errorClass' : errorClass,
+            'result': {
+                'result': False,
+                'errorClass': errorClass,
                 }
             }
 
@@ -179,30 +183,31 @@
             screenname = _noScreenname
         else:
             screenname = data[0]['screen_name']
-        log.msg('QUERY: tab=%s user=%r query=%r' % (tabName, screenname, query))
+        log.msg('QUERY: tab=%s user=%r query=%r' % (
+            tabName, screenname, query))
         d = ftwitter.fluidDBQuery(self.endpoint, query)
         d.addCallback(self._checkTooManyResults)
         d.addCallback(
             self.cache.oidUidScreennameCache.objectIdsToUsers,
             self.cache.userCache)
         d.addCallback(self._objectIdsToUsersWherePossible)
-        d.addErrback(self._screennameListError) # Catches TooManyResults
+        d.addErrback(self._screennameListError)  # Catches TooManyResults
         d.addErrback(self._fluidDBError, query)
         return d
 
     def _loginRedirectURL(self, URL):
         return {
-                'result' : {
-                    'result' : True,
-                    'URL' : URL,
+                'result': {
+                    'result': True,
+                    'URL': URL,
                     }
                 }
 
     def _loginRedirectErr(self, failure):
         return {
-                'result' : {
-                    'result' : False,
-                    'error' : str(failure),
+                'result': {
+                    'result': False,
+                    'error': str(failure),
                     }
                 }
 
@@ -216,16 +221,16 @@
             data = self.cache.cookieCache[cookie]
         except KeyError:
             return {
-                'result' : {
-                    'result' : False,
+                'result': {
+                    'result': False,
                     }
                 }
         else:
             user, _ = data
             return {
-                'result' : {
-                    'result' : True,
-                    'screen_name' : user['screen_name'],
+                'result': {
+                    'result': True,
+                    'screen_name': user['screen_name'],
                     }
                 }
 
@@ -239,24 +244,24 @@
             user, _ = data
             log.msg('Logging out user %r.' % user['screen_name'])
         return {
-                'result' : True,
+                'result': True,
             }
 
     def _tweetURL(self, response):
         import pprint
         log.msg('Update got response %s' % pprint.pformat(response))
         return {
-                'result' : {
-                    'result' : True,
-                    'URL' : twitter.statusURLFromUpdateResponse(response),
+                'result': {
+                    'result': True,
+                    'URL': twitter.statusURLFromUpdateResponse(response),
                     }
                 }
 
     def _tweetError(self, failure):
         return {
-                'result' : {
-                    'result' : False,
-                    'error' : str(failure),
+                'result': {
+                    'result': False,
+                    'error': str(failure),
                     }
                 }
 
@@ -278,7 +283,7 @@
         log.msg('Getting friend ids for %r.' % screenname)
         d = ftwitter.friendsIdFetcher(cookie, self.cache, screenname)
         d.addCallback(lambda friendsIds: {
-            'result' : { 'friendsIds' : friendsIds, },
+            'result': {'friendsIds': friendsIds},
             })
         return d
 
@@ -287,7 +292,7 @@
         d = twitter.follow(cookie, self.cache, uid)
         d.addCallback(lambda _: ftwitter.follow(cookie, self.cache,
                                                 self.endpoint, uid))
-        d.addCallback(lambda _: { 'result' : True })
+        d.addCallback(lambda _: {'result': True})
         return d
 
     def jsonrpc_unfollow(self, cookie, uid):
@@ -295,7 +300,7 @@
         d = twitter.unfollow(cookie, self.cache, uid)
         d.addCallback(lambda _: ftwitter.unfollow(cookie, self.cache,
                                                   self.endpoint, uid))
-        d.addCallback(lambda _: { 'result' : True })
+        d.addCallback(lambda _: {'result': True})
         return d
 
 
@@ -306,37 +311,37 @@
         self.cache = cache
 
     def jsonrpc_getQueueWidth(self):
-        return { 'result' : self.cache.adderCache.rdq.width }
+        return {'result': self.cache.adderCache.rdq.width}
 
     def jsonrpc_setQueueWidth(self, width):
         try:
             width = int(width)
         except ValueError:
-            return { 'result' : False }
+            return {'result': False}
         else:
             self.cache.adderCache.rdq.width = width
-            return { 'result' : True }
+            return {'result': True}
 
     def jsonrpc_queueSize(self):
-        return { 'result' : self.cache.adderCache.rdq.size() }
+        return {'result': self.cache.adderCache.rdq.size()}
 
     def jsonrpc_queuePaused(self):
-        return { 'result' : self.cache.adderCache.rdq.paused }
+        return {'result': self.cache.adderCache.rdq.paused}
 
     def jsonrpc_pause(self):
         d = self.cache.adderCache.rdq.pause()
-        d.addCallback(lambda _: { 'result' : True })
+        d.addCallback(lambda _: {'result': True})
         return d
 
     def jsonrpc_resume(self):
         self.cache.adderCache.rdq.resume()
-        return { 'result' : True }
+        return {'result': True}
 
     def jsonrpc_getQueued(self):
         pending = self.cache.adderCache.rdq.pending()
         result = [[u.screenname, u.nFriends, time.ctime(u.queuedAt)]
                   for u in pending]
-        return { 'result' : result }
+        return {'result': result}
 
     def jsonrpc_getUnderway(self):
         underway = self.cache.adderCache.rdq.underway()
@@ -348,53 +353,55 @@
                 u.job.nFriends,
                 pct,
                 time.ctime(u.job.queuedAt),
-                time.ctime(u.startTime),]
+                time.ctime(u.startTime)]
                 )
-        return { 'result' : result }
+        return {'result': result}
 
     def jsonrpc_getMaxRequestsLimit(self):
-        return { 'result' : ftwitter.MAX_SIMULTANEOUS_REQUESTS }
+        return {'result': ftwitter.MAX_SIMULTANEOUS_REQUESTS}
 
     def jsonrpc_setMaxRequestsLimit(self, limit):
         try:
             ftwitter.MAX_SIMULTANEOUS_REQUESTS = int(limit)
         except ValueError:
-            return { 'result' : False }
+            return {'result': False}
         else:
-            return { 'result' : True }
+            return {'result': True}
 
     def jsonrpc_getFriendsLimit(self):
-        return { 'result' : defaults.FRIENDS_LIMIT }
+        return {'result': defaults.FRIENDS_LIMIT}
 
     def jsonrpc_setFriendsLimit(self, limit):
         try:
             defaults.FRIENDS_LIMIT = int(limit)
         except ValueError:
-            return { 'result' : False }
+            return {'result': False}
         else:
-            return { 'result' : True }
+            return {'result': True}
 
     def jsonrpc_getResultsLimit(self):
-        return { 'result' : defaults.RESULTS_LIMIT }
+        return {'result': defaults.RESULTS_LIMIT}
 
     def jsonrpc_setResultsLimit(self, limit):
         try:
             defaults.RESULTS_LIMIT = int(limit)
         except ValueError:
-            return { 'result' : False }
+            return {'result': False}
         else:
-            return { 'result' : True }
+            return {'result': True}
 
     def jsonrpc_directAddUser(self, screenname):
         def _err(fail):
             return {
-                'error' : None,
-                'message' : str(fail.value),
+                'error': None,
+                'message': str(fail.value),
                 }
+
         def _ok(result):
             return {
-                'result' : True,
+                'result': True,
                 }
+
         d = ftwitter.directAddUser(self.cache, screenname)
         d.addCallbacks(_ok, _err)
         return d
@@ -405,11 +412,11 @@
             log.msg('Errs is %r' % (errs,))
             if errs:
                 return {
-                    'message' : errs,
+                    'message': errs,
                     }
             else:
                 return {
-                    'result' : True,
+                    'result': True,
                     }
 
         d = ftwitter.bulkAddUsers(self.cache, screennames.split())
@@ -421,9 +428,9 @@
             self.cache.adderCache.cancel(screenname)
         except Exception, e:
             return {
-                'message' : str(e)
+                'message': str(e)
                 }
         else:
             return {
-                'result' : True,
+                'result': True,
                 }

=== modified file 'tickery/test/test_looper.py'
--- tickery/test/test_looper.py	2011-06-14 20:36:36 +0000
+++ tickery/test/test_looper.py	2011-06-16 16:17:19 +0000
@@ -91,7 +91,7 @@
         self.succeeded = False
 
     def __call__(self, *args, **kw):
-        # Make sure we're called with the args we're supposed to be called with.
+        # Make sure we're called with args we're supposed to be called with.
         assert self.args == args
         assert self.kw == kw
 
@@ -113,6 +113,7 @@
         assert self.nFails == self.failCount, '%d != %d' % (self.nFails,
                                                             self.failCount)
 
+
 class CallCounter(object):
     """Provide a callable that counts the number of times it's invoked."""
     def __init__(self):
@@ -158,9 +159,11 @@
     def testSimpleDeferredReturner(self):
         result1 = 15
         result2 = 16
+
         def _ret(result):
             self.assertEqual(result, result1)
             return result2
+
         rc = RetryingCall(lambda: defer.succeed(result1))
         d = rc.start()
         d.addCallback(_ret)

=== modified file 'tickery/test/test_query.py'
--- tickery/test/test_query.py	2011-06-14 20:49:53 +0000
+++ tickery/test/test_query.py	2011-06-16 16:17:19 +0000
@@ -70,10 +70,8 @@
             ):
             self._simpleTokenErrorCheck(query, value, offset)
 
-
     def testSimpleUnparseableErrors(self):
         for query in ('',
                       '(',
                       ):
             self._simpleUnparseableCheck(query)
-

=== modified file 'tickery/twitter.py'
--- tickery/twitter.py	2011-06-14 20:49:53 +0000
+++ tickery/twitter.py	2011-06-16 16:17:19 +0000
@@ -12,8 +12,10 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import urllib, functools, time
+import functools
 import json
+import time
+import urllib
 
 from twisted.internet import defer
 from twisted.internet.error import ConnectionLost
@@ -43,18 +45,17 @@
           http.SERVICE_UNAVAILABLE, http.GATEWAY_TIMEOUT)
 
 POSTHeaders = {
-    'Content-Type' : 'application/x-www-form-urlencoded; charset=utf-8',
-    'X-Twitter-Client' : 'Tickery',
-    'X-Twitter-Client-Version' : version.version,
-    'X-Twitter-Client-URL' : defaults.TICKERY_URL,
+    'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
+    'X-Twitter-Client': 'Tickery',
+    'X-Twitter-Client-Version': version.version,
+    'X-Twitter-Client-URL': defaults.TICKERY_URL,
     }
 
 
-
 class _Fetcher(object):
     baseURL = TWITTER_URL + '/'
-    URITemplate = None # Override in subclass.
-    dataKey = None # Override in subclass.
+    URITemplate = None  # Override in subclass.
+    dataKey = None  # Override in subclass.
     headers = {}
     maxErrs = 10
 
@@ -66,7 +67,7 @@
         self.nextCursor = -1
         self.deferred = defer.Deferred()
         self.URL = self.baseURL + (
-            self.URITemplate % { 'name' : urllib.quote(name.encode('utf-8'))})
+            self.URITemplate % {'name': urllib.quote(name.encode('utf-8'))})
         self.token = token
 
     def _reportElapsed(self, result):
@@ -182,6 +183,7 @@
             elif status not in okErrs:
                 return fail
 
+
 def userByScreenname(screenname):
     r = RetryingCall(client.getPage,
                      '%s/users/show.json?screen_name=%s' %
@@ -191,6 +193,7 @@
     d.addCallback(lambda j: json.loads(j))
     return d
 
+
 def userById(uid):
     r = RetryingCall(client.getPage,
                      '%s/users/show.json?user_id=%s' % (TWITTER_URL, uid))
@@ -199,6 +202,7 @@
     d.addCallback(lambda j: json.loads(j))
     return d
 
+
 def _urlencodeDict(d):
     result = []
     for k, v in d.iteritems():
@@ -206,6 +210,7 @@
                                  urllib.quote(v.encode("utf-8"))))
     return '&'.join(result)
 
+
 def updateStatus(status, cookie, cookieDict):
     log.msg('Sending tweet %r' % status)
     try:
@@ -214,7 +219,7 @@
         log.err('updateStatus: Could not find cookie' % cookie)
         return defer.fail(terror.NoSuchCookie())
 
-    parameters = { 'status' : status }
+    parameters = {'status': status}
     oaRequest = oauth.OAuthRequest.from_consumer_and_token(
         consumer.consumer, token=accessToken, parameters=parameters,
         http_url=UPDATE_STATUS_URL, http_method='POST')
@@ -231,6 +236,7 @@
     d.addCallback(lambda j: json.loads(j))
     return d
 
+
 def statusURLFromUpdateResponse(response):
     'Response is the JSON returned by a statuses/update.json API call.'
     return '%s/%s/status/%s' % (
@@ -238,14 +244,17 @@
         urllib.quote(response[u'user'][u'screen_name'].encode('utf-8')),
         response[u'id'])
 
+
 def _updateUserCache_cb(user, cache):
     cache.userCache.add(user)
     return user
 
+
 def _invalidateResultCache_cb(result, cache, screenname):
     cache.queryCache.invalidateQueriesForScreenname(screenname)
     return result
 
+
 def _followOrUnfollow(follow, cookie, cache, uid):
     try:
         user, accessToken = cache.cookieCache[cookie]
@@ -258,7 +267,7 @@
     else:
         url = UNFOLLOW_URL
 
-    parameters = { 'user_id' : str(uid) }
+    parameters = {'user_id': str(uid)}
     oaRequest = oauth.OAuthRequest.from_consumer_and_token(
         consumer.consumer, token=accessToken, parameters=parameters,
         http_url=url, http_method='POST')

=== modified file 'tickery/usercache.py'
--- tickery/usercache.py	2011-06-14 20:36:36 +0000
+++ tickery/usercache.py	2011-06-16 16:17:19 +0000
@@ -28,6 +28,7 @@
     u'screen_name',
     u'statuses_count',)
 
+
 def dictSubset(d, names):
     '''Return a new dict consisting of the items in d that are in names.'''
     return dict([(key, d[key]) for key in names if key in d])
@@ -46,7 +47,7 @@
                 (u['screen_name'].lower(), u) for u in self.uidToUser.values())
 
     def __str__(self):
-        s = [ '%d names in Twitter user cache' % len(self.screennameToUser) ]
+        s = ['%d names in Twitter user cache' % len(self.screennameToUser)]
         for key in sorted(self.screennameToUser.keys()):
             item = self.screennameToUser[key]
             s.append('%s: id=%s' % (key, item['id']))
@@ -71,8 +72,10 @@
     def usersByScreennames(self, screennames):
         # Return a dict of screenname -> user or failure.
         result = {}
+
         def _done(what, screenname):
             result[screenname] = what
+
         deferreds = []
         for screenname in screennames:
             d = self.userByScreenname(screenname)

=== modified file 'tickery/utils.py'
--- tickery/utils.py	2011-06-14 20:36:36 +0000
+++ tickery/utils.py	2011-06-16 16:17:19 +0000
@@ -43,8 +43,8 @@
     def create(cls, endpoint, username, name, password, email):
         def _parseResponse(response):
             return cls(username, response[u'id'])
-        data = { 'userName' : username, 'name' : name,
-                 'password' : password, 'email' : email }
+        data = {'userName': username, 'name': name,
+                'password': password, 'email': email}
         d = endpoint.submit(endpoint.getRootURL() + 'users',
                             method='POST', data=data)
         return d.addCallback(_parseResponse)

=== modified file 'tickery/www/Popups.py'
--- tickery/www/Popups.py	2011-06-14 20:36:36 +0000
+++ tickery/www/Popups.py	2011-06-16 16:17:19 +0000
@@ -23,14 +23,17 @@
 
 modal_popups = {}
 
+
 def ModalPopupActive(title):
-    return modal_popups.has_key(title)
+    return title in modal_popups
+
 
 def ModalPopupCloseAll():
     while len(modal_popups) > 0:
         k = modal_popups.keys()[0]
         modal_popups[k].hide()
 
+
 class DialogBoxModal(PopupPanel):
     def __init__(self, identifier, autoHide=None, modal=False, rootpanel=None):
         PopupPanel.__init__(self, autoHide, modal, rootpanel)
@@ -146,15 +149,15 @@
             top = 0
 
         element = self.getElement()
-        DOM.setStyleAttribute(element, 'left', '%dpx' % left )
+        DOM.setStyleAttribute(element, 'left', '%dpx' % left)
         DOM.setStyleAttribute(element, 'top', '%dpx' % top)
 
     def show(self):
         if self.showing:
             return
 
-        if modal_popups.has_key(self.identifier) and \
-           modal_popups[self.identifier] != self:
+        if (self.identifier in modal_popups and
+            modal_popups[self.identifier] != self):
             return
         modal_popups[self.identifier] = self
 
@@ -164,7 +167,7 @@
         if not self.showing:
             return
 
-        if modal_popups.has_key(self.identifier):
+        if self.identifier in modal_popups:
             del modal_popups[self.identifier]
 
         PopupPanel.hide(self)
@@ -185,7 +188,7 @@
 class PopupFrame(DialogBoxModal):
 
     def __init__(self, identifier, title, iframe):
-        if modal_popups.has_key(identifier):
+        if identifier in modal_popups:
             return
         modal_popups[identifier] = self
 

=== modified file 'tickery/www/about.py'
--- tickery/www/about.py	2011-06-14 20:36:36 +0000
+++ tickery/www/about.py	2011-06-16 16:17:19 +0000
@@ -16,7 +16,8 @@
 from pyjamas.ui.Grid import Grid
 
 body = """
-<a href=\"http://fluidinfo.com\"><img src=\"fluidinfo.png\" class=\"about-logo\"/></a><h2>About Tickery</h2>
+<a href=\"http://fluidinfo.com\"><img src=\"fluidinfo.png\" \
+class=\"about-logo\"/></a><h2>About Tickery</h2>
 
 <p>
 
@@ -75,7 +76,9 @@
 At Fluidinfo, we believe it will one day be <em>much</em> easier to work
 with information. We've built FluidDB to show you what we think the future
 will look like. It's a future in which we'll work with information in more
-flexible ways, and with data that is <a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/24/truly-social-data/\">truly social</a>.
+flexible ways, and with data that is
+<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/24/\
+truly-social-data/\">truly social</a>.
 
 </p>
 
@@ -91,13 +94,21 @@
 href=\"http://blogs.fluidinfo.com/fluidDB\">FluidDB blog</a>. In particular,
 the following articles provide a good set of viewpoints:
 
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/24/truly-social-data/\">Truly Social Data</a>,
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/25/kaleidoscope-10-takes-on-fluiddb/\">Kaleidoscope: 10 Takes on FluidDB</a>,
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/28/information-naturally/\">Information. Naturally.</a>,
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/10/03/fluiddb-as-a-universal-metadata-engine/\">FluidDB as a Universal Metadata Engine</a>,
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/11/12/why-are-post-it-notes-sticky/\">Why are Post-It Notes Sticky?</a>,
+<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/24/\
+truly-social-data/\">Truly Social Data</a>,
+<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/25/\
+kaleidoscope-10-takes-on-fluiddb/\">Kaleidoscope: 10 Takes on FluidDB</a>,
+<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/28/\
+information-naturally/\">Information. Naturally.</a>,
+<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/10/03/\
+fluiddb-as-a-universal-metadata-engine/\">FluidDB as a Universal Metadata
+Engine</a>,
+<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/11/12/\
+why-are-post-it-notes-sticky/\">Why are Post-It Notes Sticky?</a>,
 and
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/12/01/putting-metadata-onto-tweets-with-fluiddb/\">Putting Metadata onto Tweets with FluidDB</a>.
+<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/12/01/\
+putting-metadata-onto-tweets-with-fluiddb/\">Putting Metadata onto Tweets
+with FluidDB</a>.
 
 <p>
 
@@ -105,7 +116,8 @@
 href=\"http://fluidinfo.com/accounts/new\">reserve a FluidDB username</a>
 and then <a href=\"mailto:[e-mail]\">send us mail</a> to get a
 password.  Note that FluidDB is still in an early <a
-href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/17/a-private-alpha-launch/\">private alpha</a> phase.
+href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/17/\
+a-private-alpha-launch/\">private alpha</a> phase.
 
 </p>
 

=== modified file 'tickery/www/advanced.py'
--- tickery/www/advanced.py	2011-06-14 20:36:36 +0000
+++ tickery/www/advanced.py	2011-06-16 16:17:19 +0000
@@ -13,7 +13,8 @@
 # permissions and limitations under the License.
 
 from tickerytab import LargeQueryTab
-import simple, defaults
+import simple
+import defaults
 
 from pyjamas.ui.HTML import HTML
 
@@ -56,7 +57,9 @@
 class=\"example\">%(simpleUser1)s</span> and <span
 class=\"example\">%(simpleUser2)s</span> results in the query
 
-<a href=\"%(advancedq)shas+%(friends)s/%(simpleUser1)s+and+has+%(friends)s/%(simpleUser2)s\">has %(friends)s/%(simpleUser1)s and has %(friends)s/%(simpleUser2)s</a>
+<a href=\"%(advancedq)shas+%(friends)s/%(simpleUser1)s+and+has+\
+%(friends)s/%(simpleUser2)s\">has %(friends)s/%(simpleUser1)s and \
+has %(friends)s/%(simpleUser2)s</a>
 
 being sent to FluidDB. I.e., Tickery asks FluidDB for all objects that have
 a <span class=\"example\">%(friends)s/%(simpleUser1)s</span> tag and also a
@@ -71,7 +74,8 @@
 
 results in the FluidDB query:
 
-<a href=\"%(advancedq)shas+%(friends)s/biz+except+has+%(friends)s/ev\">has %(friends)s/biz except has %(friends)s/ev</a>.
+<a href=\"%(advancedq)shas+%(friends)s/biz+except+has+%(friends)s/ev\">\
+has %(friends)s/biz except has %(friends)s/ev</a>.
 
 That is, Tickery asks FluidDB for all objects that have a
 <span class=\"example\">%(friends)s/biz</span>
@@ -104,10 +108,13 @@
 <a href=\"%(advancedq)stwitter.com/users/id<100\">twitter.com/users/id <
 100</a>, or we can look for a particular user:
 
-<a href='%(advancedq)stwitter.com/users/screen_name+=+\"%(simpleUser1)s\"'>twitter.com/users/screen_name = \"%(simpleUser1)s\"</a>. FluidDB has some other
-Twitter tags on its objects too. For example, you can query
+<a href='%(advancedq)stwitter.com/users/screen_name+=+\"%(simpleUser1)s\"'>\
+twitter.com/users/screen_name = \"%(simpleUser1)s\"</a>.
+FluidDB has some other Twitter tags on its objects too. For example, you
+can query
 
-<a href='%(advancedq)stwitter.com/users/followers_count+>+100000'>twitter.com/users/followers_count > 100000</a>.
+<a href='%(advancedq)stwitter.com/users/followers_count+>+100000'>\
+twitter.com/users/followers_count > 100000</a>.
 
 <p/>
 
@@ -126,11 +133,14 @@
 class=\"example\">terrycojones/met</span> tag to FluidDB's objects for
 Twitter people that I've met in person. So the query
 
-<a href='%(advancedq)shas+%(friends)s/terrycojones+and+has+terrycojones/met'>has %(friends)s/terrycojones and has terrycojones/met</a>
+<a href='%(advancedq)shas+%(friends)s/terrycojones+and+has+terrycojones/met'>\
+has %(friends)s/terrycojones and has terrycojones/met</a>
 
 shows the Twitter people I follow that I have also met, while
 
-<a href='%(advancedq)shas+%(friends)s/terrycojones+except+has+terrycojones/met'>has %(friends)s/terrycojones except has terrycojones/met</a>
+<a href='%(advancedq)shas+%(friends)s/\
+terrycojones+except+has+terrycojones/met'>has %(friends)s/terrycojones \
+except has terrycojones/met</a>
 
 shows those I have not met.
 
@@ -142,11 +152,16 @@
 class=\"example\">esteve/met</span> tags to the people he follows and has
 met. The query
 
-<a href='%(advancedq)s(has+%(friends)s/terrycojones+and+has+%(friends)s/esteve)+except+(has+terrycojones/met+or+has+esteve/met)'>(has %(friends)s/terrycojones and has %(friends)s/esteve) except (has terrycojones/met or has esteve/met)</a>
+<a href='%(advancedq)s(has+%(friends)s/terrycojones+and+has+%(friends)s\
+/esteve)+except+(has+terrycojones/met+or+has+esteve/met)'>(has %(friends)s\
+/terrycojones and has %(friends)s/esteve) except (has terrycojones/met or \
+has esteve/met)</a>
 
 shows people we both follow but which neither of us has met. And
 
-<a href='%(advancedq)s(has+%(friends)s/esteve+and+has+terrycojones/met)+except+has+esteve/met'>(has %(friends)s/esteve and has terrycojones/met) except has esteve/met</a>
+<a href='%(advancedq)s(has+%(friends)s/esteve+and+has+terrycojones/met)+\
+except+has+esteve/met'>(has %(friends)s/esteve and has terrycojones/met) \
+except has esteve/met</a>
 
 shows people Esteve follows that I have met in person but whom he has
 not&mdash;we could use this, and its complement, to figure out who we
@@ -183,31 +198,32 @@
 href=\"http://fluidinfo.com/accounts/new\">reserve a FluidDB username</a>
 and then <a href=\"mailto:[e-mail]\">send us mail</a> to get a
 password.  Note that FluidDB is still in an early <a
-href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/17/a-private-alpha-launch/\">private alpha</a> phase.
+href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/17/\
+a-private-alpha-launch/\">private alpha</a> phase.
 
 </p>
 
 """ % {
-    'simpleUser1' : simple._defaultName1,
-    'simpleUser2' : simple._defaultName2,
-    'friends' : '%s/%s' % (defaults.TWITTER_USERNAME,
+    'simpleUser1': simple._defaultName1,
+    'simpleUser2': simple._defaultName2,
+    'friends': '%s/%s' % (defaults.TWITTER_USERNAME,
                            defaults.TWITTER_FRIENDS_NAMESPACE_NAME),
-    'intq' : '%s/?tab=intermediate&query=' % defaults.TICKERY_URL,
-    'advancedq' : '%s/?tab=advanced&query=' % defaults.TICKERY_URL,
+    'intq': '%s/?tab=intermediate&query=' % defaults.TICKERY_URL,
+    'advancedq': '%s/?tab=advanced&query=' % defaults.TICKERY_URL,
 }
 
 
-
 class Advanced(LargeQueryTab):
 
     tabName = 'advanced'
 
     defaultQuery = (
         '''has %(tw)s/%(fr)s/jack and has %(tw)s/%(fr)s/ev''' %
-        { 'tw' : 'twitter.com', 'fr' : 'friends', })
+        {'tw': 'twitter.com', 'fr': 'friends'})
 
     def __init__(self, topPanel):
         self.goButtonRemoteMethod = 'fluidDBQuery'
         self.instructions = HTML(_instructions)
-        self.instructionsTitle = 'The FluidDB query language & the advanced tab'
+        self.instructionsTitle = ('The FluidDB query language '
+                                  '& the advanced tab')
         LargeQueryTab.__init__(self, topPanel)

=== modified file 'tickery/www/banner.py'
--- tickery/www/banner.py	2010-07-20 09:47:02 +0000
+++ tickery/www/banner.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,8 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import utils, server
+import utils
+import server
 
 from pyjamas.ui.Image import Image
 from pyjamas.ui.HTML import HTML

=== modified file 'tickery/www/defaults.py'
--- tickery/www/defaults.py	2010-07-20 09:47:02 +0000
+++ tickery/www/defaults.py	2011-06-16 16:17:19 +0000
@@ -47,7 +47,7 @@
 
 FLUIDDB_ENDPOINT = 'http://fluiddb.fluidinfo.com/'
 SANDBOX_ENDPOINT = 'http://sandbox.fluidinfo.com/'
-LOCAL_ENDPOINT   = 'http://localhost:8080/'
+LOCAL_ENDPOINT = 'http://localhost:8080/'
 
 FRIENDS_LIMIT = 1000
 RESULTS_LIMIT = 1000

=== modified file 'tickery/www/index.py'
--- tickery/www/index.py	2011-06-14 20:36:36 +0000
+++ tickery/www/index.py	2011-06-16 16:17:19 +0000
@@ -17,7 +17,9 @@
 from pyjamas.ui.SimplePanel import SimplePanel
 from pyjamas import Timer, DeferredCommand, Window
 
-import tabs, userlist, defaults
+import tabs
+import userlist
+import defaults
 
 
 class Tickery(SimplePanel):

=== modified file 'tickery/www/intermediate.py'
--- tickery/www/intermediate.py	2010-07-20 09:47:02 +0000
+++ tickery/www/intermediate.py	2011-06-16 16:17:19 +0000
@@ -103,7 +103,7 @@
 </p>
 
 """ % {
-    'intq' : '%s/?tab=intermediate&query=' % defaults.TICKERY_URL,
+    'intq': '%s/?tab=intermediate&query=' % defaults.TICKERY_URL,
 }
 
 

=== modified file 'tickery/www/login.py'
--- tickery/www/login.py	2011-06-14 20:36:36 +0000
+++ tickery/www/login.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,10 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import defaults, utils, server, tickerytab
+import defaults
+import server
+import tickerytab
+import utils
 
 from pyjamas.ui.Grid import Grid
 from pyjamas.ui.HTML import HTML
@@ -22,6 +25,7 @@
 from pyjamas.ui import HasAlignment, Event
 from pyjamas import Window, Cookies, DOM
 
+
 def _deleteCookie():
     # Set the cookie back in time a few years.
     Cookies.setCookie(defaults.OAUTH_COOKIE, '', -100000000)
@@ -207,7 +211,6 @@
         self.sender.notLoggedIn()
 
 
-
 class SetFriends(object):
     def __init__(self, screenname, sender):
         self.screenname = screenname
@@ -218,7 +221,10 @@
         d = {}
         for fid in friendsIds:
             d[fid] = None
-        self.sender.friendsIds = d #ict.fromkeys(friendsIds)
+        # TODO: figure out if the next line is right or an accidental
+        # insertion of " #" that just happens to have created valid
+        # code. The "d #ict" code is running on tickery.net
+        self.sender.friendsIds = d  # ict.fromkeys(friendsIds)
         self.sender.loggedIn = True
         # All done, finalize the setup of all existing UserListPanels so
         # they can filter users based on the friendsIds we just retrieved.

=== modified file 'tickery/www/results.py'
--- tickery/www/results.py	2010-07-20 09:47:02 +0000
+++ tickery/www/results.py	2011-06-16 16:17:19 +0000
@@ -35,7 +35,7 @@
             users = result['users']
             title = self.titleMaker(users)
             if users:
-                kw = { 'query' : self.query }
+                kw = {'query': self.query}
                 if self.tabName == 'simple':
                     kw['screennames'] = self.sender.getNames()
                 self.sender.results.setUsers(title, users, kw)

=== modified file 'tickery/www/simple.py'
--- tickery/www/simple.py	2011-06-14 20:36:36 +0000
+++ tickery/www/simple.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,13 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import urllib, utils, userlist, go, server, text, defaults
+import urllib
+import utils
+import userlist
+import go
+import server
+import text
+import defaults
 from results import ResultHandler
 
 from tickerytab import TickeryTab
@@ -27,6 +33,7 @@
 _defaultName1 = 'timoreilly'
 _defaultName2 = 'timbray'
 
+
 class Simple(TickeryTab):
 
     tabName = 'simple'
@@ -173,11 +180,11 @@
     def resultsLink(self):
         name1, name2 = self.getNames()
         d = {
-        'name1' : name1,
-        'name2' : name2,
-        'sort' : userlist._sortKey,
-        'icon' : userlist._iconSize,
-        'tab' : self.tabName,
+        'name1': name1,
+        'name2': name2,
+        'sort': userlist._sortKey,
+        'icon': userlist._iconSize,
+        'tab': self.tabName,
             }
 
         return '%s?%s' % (defaults.TICKERY_URL, urllib.urlencode(d))

=== modified file 'tickery/www/tabs.py'
--- tickery/www/tabs.py	2011-06-14 20:36:36 +0000
+++ tickery/www/tabs.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,12 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import toppanel, simple, intermediate, advanced, about, login
+import toppanel
+import simple
+import intermediate
+import advanced
+import about
+import login
 
 from pyjamas.ui.TabPanel import TabPanel
 from pyjamas.ui.HTML import HTML

=== modified file 'tickery/www/tickerytab.py'
--- tickery/www/tickerytab.py	2011-06-14 20:36:36 +0000
+++ tickery/www/tickerytab.py	2011-06-16 16:17:19 +0000
@@ -14,7 +14,12 @@
 
 import urllib
 
-import go, userlist, server, text, results, defaults
+import go
+import userlist
+import server
+import text
+import results
+import defaults
 
 from pyjamas.ui.Label import Label
 from pyjamas.ui.Button import Button
@@ -47,15 +52,16 @@
 
 SHORT_INSTRUCTIONS = {
     # Don't put line breaks into the following strings. MSIE preserves them!
-    'intermediate' :
+    'intermediate':
     """Explore sets of Twitter friends by querying on their user names""",
 
-    'advanced' :
+    'advanced':
     """Query Twitter friends & more with the full FluidDB query language""",
     }
 
 HELP_TEXT = 'huh?'
 
+
 def titleMaker(users):
     if users:
         nUsers = len(users)
@@ -68,17 +74,16 @@
         return 'Results set is empty.'
 
 
-
 class TickeryTab(VerticalPanel):
 
-    process = None # Define in subclass.
+    process = None  # Define in subclass.
 
     def __init__(self, topPanel, **kwargs):
         VerticalPanel.__init__(self,
                                HorizontalAlignment=HasAlignment.ALIGN_LEFT,
                                StyleName='tickery-tab',
                                **kwargs)
-        self.topPanel = topPanel # don't add this yet!
+        self.topPanel = topPanel  # don't add this yet!
         self.topGrid = Grid(1, 2, StyleName='tickery-tab-top-grid',
                             HorizontalAlignment=HasAlignment.ALIGN_LEFT)
         self.add(self.topGrid)
@@ -199,10 +204,10 @@
 
     def resultsLink(self):
         d = {
-        'query' : self.query.getText().strip(),
-        'sort' : userlist._sortKey,
-        'icon' : userlist._iconSize,
-        'tab' : self.tabName,
+        'query': self.query.getText().strip(),
+        'sort': userlist._sortKey,
+        'icon': userlist._iconSize,
+        'tab': self.tabName,
             }
 
         return '%s?%s' % (defaults.TICKERY_URL, urllib.urlencode(d))

=== modified file 'tickery/www/tweet.py'
--- tickery/www/tweet.py	2011-06-14 20:36:36 +0000
+++ tickery/www/tweet.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,9 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import server, userlist, text
+import server
+import userlist
+import text
 
 from pyjamas.ui.HTML import HTML
 from pyjamas.ui.Label import Label

=== modified file 'tickery/www/unknown.py'
--- tickery/www/unknown.py	2011-06-14 20:36:36 +0000
+++ tickery/www/unknown.py	2011-06-16 16:17:19 +0000
@@ -17,7 +17,8 @@
 from pyjamas.ui.Grid import Grid
 from pyjamas.ui.VerticalPanel import VerticalPanel
 
-import utils, go
+import utils
+import go
 
 
 class UserList(VerticalPanel):
@@ -78,7 +79,8 @@
 
 class UnaddedUsers(VerticalPanel):
     def __init__(self, statusSummary, sender):
-        VerticalPanel.__init__(self, Spacing=10, StyleName='userlist-error-box')
+        VerticalPanel.__init__(self, Spacing=10,
+                               StyleName='userlist-error-box')
         self.add(HTML("We're currently working on users you mentioned",
                        StyleName='userlist-error-title'))
 

=== modified file 'tickery/www/userlist.py'
--- tickery/www/userlist.py	2011-06-14 20:36:36 +0000
+++ tickery/www/userlist.py	2011-06-16 16:17:19 +0000
@@ -12,7 +12,10 @@
 # implied.  See the License for the specific language governing
 # permissions and limitations under the License.
 
-import utils, tweet, server, defaults
+import utils
+import tweet
+import server
+import defaults
 
 from pyjamas.ui.Label import Label
 from pyjamas.ui.Image import Image
@@ -33,6 +36,7 @@
              ('Large', 'large'),
              )
 
+
 def setIconSize(size):
     global _iconSize
     if size and size in [d[1] for d in _iconData]:
@@ -57,6 +61,7 @@
                 (u'Public (true/false)', 'protected'),
                 )
 
+
 def setSortKey(key):
     global _sortKey
     if key and key in [d[1] for d in _sortKeyData]:
@@ -409,6 +414,7 @@
         decreasing = _sortKey in (
             'friends_count', 'followers_count', 'statuses_count')
         alpha = _sortKey in ('screen_name', 'name', 'location')
+
         def _keyFunc(n):
             value = self.users[n][_sortKey]
             if decreasing:
@@ -504,6 +510,7 @@
     def adjustSize(self, width, height):
         self.adjustWidths(width)
 
+
 class IconAdder(object):
 
     _updatesPerLoop = 5

=== modified file 'tickery/www/utils.py'
--- tickery/www/utils.py	2010-07-20 09:47:02 +0000
+++ tickery/www/utils.py	2011-06-16 16:17:19 +0000
@@ -14,19 +14,24 @@
 
 import urllib
 
+
 def screennameToTwitterURL(s):
     return 'http://twitter.com/%s' % urllib.quote(s)
 
+
 def screennameToTwitterLink(s, text=None):
     text = text or s
     return '<a href="%s">%s</a>' % (screennameToTwitterURL(s), text)
 
+
 def screennameToTwitterFriendsLink(s, text):
     return '<a href="%s/following">%s</a>' % (screennameToTwitterURL(s), text)
 
+
 def screennameToTwitterFollowersLink(s, text):
     return '<a href="%s/followers">%s</a>' % (screennameToTwitterURL(s), text)
 
+
 def splitthousands(n, sep=','):
     # From http://code.activestate.com/recipes/498181/
     s = '%s' % n  # This to keep MSIE quiet?

=== modified file 'twisted/plugins/tickery_service.py'
--- twisted/plugins/tickery_service.py	2011-06-14 20:36:36 +0000
+++ twisted/plugins/tickery_service.py	2011-06-16 16:17:19 +0000
@@ -33,7 +33,7 @@
     optParameters = [
         ['cache-dir', None, 'CACHE', 'The directory for cache files.'],
         ['queue-width', None, 3, 'The initial size of the dispatch queue.'],
-        ['port', None, defaults.TICKERY_SERVICE_PORT, 'The port to listen on.'],
+        ['port', None, defaults.TICKERY_SERVICE_PORT, 'Port to listen on.'],
         ]
     optFlags = [
         ['noisy-logging', None, "If True, let factories log verbosely."],
@@ -62,7 +62,8 @@
 
         root = File('www/output')
         root.putChild('tickery', RegularService(cache, endpoint))
-        root.putChild(defaults.TICKERY_CALLBACK_CHILD, callback.Callback(cache))
+        root.putChild(defaults.TICKERY_CALLBACK_CHILD,
+                      callback.Callback(cache))
 
         adminRoot = File('admin/output')
         adminRoot.putChild('tickery', AdminService(cache))
@@ -74,7 +75,7 @@
         if options['promiscuous']:
             kw = {}
         else:
-            kw = { 'interface' : 'localhost' }
+            kw = {'interface': 'localhost'}
         tickeryServer = internet.TCPServer(int(options['port']), factory, **kw)
         tickeryServer.setServiceParent(tickeryService)