Cosmetic fiddling.

Fixing typos and layout issues.

diff --git a/backend.py b/backend.py
index 1725d7d61edc33376ea7bb70059ac07f64e1f8b9..8c4d4d1070b8a87d425234e94d7aa9d08a4a4887 100644 (file)
--- a/backend.py
+++ b/backend.py
@@ -227,7 +227,7 @@ class FlatFileBackend (object):
           try: OS.unlink(tmp)
           except: pass
 
           try: OS.unlink(tmp)
           except: pass
 

-    ## If there's a locekfile, then acquire it around the meat of this
+    ## If there's a lockfile, then acquire it around the meat of this

     ## function; otherwise just do the job.
     if me._lock is None:
       doit()
     ## function; otherwise just do the job.
     if me._lock is None:
       doit()

diff --git a/cmd-admin.py b/cmd-admin.py
index 8cea8e797143befe34fbbaa9b2992994a70a771c..577fe7aed18cde4df312be88af3331f98149bfb0 100644 (file)
--- a/cmd-admin.py
+++ b/cmd-admin.py
@@ -128,7 +128,7 @@ def cmd_addacct(user, service, alias = None):
                  user = user, service = service)
     if D.DB.fetchone() is not None:
       raise U.ExpectedError, (
                  user = user, service = service)
     if D.DB.fetchone() is not None:
       raise U.ExpectedError, (

-        400, "User `%s' already has `%s' account" % (user, service))
+        400, "User `%s' already has a `%s' account" % (user, service))

     D.DB.execute("""INSERT INTO services (service, user, alias)
                     VALUES ($service, $user, $alias)""",
                  service = service, user = user, alias = alias)
     D.DB.execute("""INSERT INTO services (service, user, alias)
                     VALUES ($service, $user, $alias)""",
                  service = service, user = user, alias = alias)

diff --git a/cmd-remote.py b/cmd-remote.py
index 6463d5384e6c7c3b1bfed623c0435536d53647b7..c8f0aed3f46d0e7aa9052f30a12954470817e7c4 100644 (file)
--- a/cmd-remote.py
+++ b/cmd-remote.py
@@ -28,8 +28,7 @@ import subcommand as SC
 import util as U
 
 @SC.subcommand(
 import util as U
 
 @SC.subcommand(

-  'set', ['remote'],
-  'Set password for remote service',
+  'set', ['remote'], 'Set password for remote service',

   params = [SC.Arg('service'), SC.Arg('user')])
 def cmd_set_svc(service, user):
   new = U.readline('new password')
   params = [SC.Arg('service'), SC.Arg('user')])
 def cmd_set_svc(service, user):
   new = U.readline('new password')


@@ -37,8 +36,7 @@ def cmd_set_svc(service, user):
   svc.setpasswd(user, new)
 
 @SC.subcommand(
   svc.setpasswd(user, new)
 
 @SC.subcommand(

-  'clear', ['remote'],
-  'Clear password for remote service',
+  'clear', ['remote'], 'Clear password for remote service',

   params = [SC.Arg('service'), SC.Arg('user')])
 def cmd_set_svc(service, user):
   svc = CU.check_service(service)
   params = [SC.Arg('service'), SC.Arg('user')])
 def cmd_set_svc(service, user):
   svc = CU.check_service(service)

diff --git a/cmdutil.py b/cmdutil.py
index a20b8dd745c911cfab0d135d587363fd12bfa44c..55939e6436beabc61a4856d08a1a386b89132e1f 100644 (file)
--- a/cmdutil.py
+++ b/cmdutil.py
@@ -144,7 +144,7 @@ def matching_items(want, tab, cond = [], tail = '', **kw):
   """
   Generate the matching items from a query constructed dynamically.
 
   """
   Generate the matching items from a query constructed dynamically.
 

-  Usually you wouldn't go through this palaver for a static query, but his
+  Usually you wouldn't go through this palaver for a static query, but this

   function helps with building queries in pieces.  WANT should be a list of
   column names we should output, appropriately qualified if there are
   multiple tables; TAB should be a list of table names, in the form `FOO as
   function helps with building queries in pieces.  WANT should be a list of
   column names we should output, appropriately qualified if there are
   multiple tables; TAB should be a list of table names, in the form `FOO as

diff --git a/service.py b/service.py
index 26406b5b5480bda9d9f31ec0a018efb131f9dd9c..8b1c87b3f7ed4f214d64ad4a101015bdc20b688b 100644 (file)
--- a/service.py
+++ b/service.py
@@ -329,9 +329,7 @@ class CommandRemoteService (BasicRemoteService):
   R_PAT = RX.compile('%(.)')
 
   def __init__(me, set, clear, *args, **kw):
   R_PAT = RX.compile('%(.)')
 
   def __init__(me, set, clear, *args, **kw):

-    """
-    Initialize the command remote service.
-    """
+    """Initialize the command remote service."""

     super(CommandRemoteService, me).__init__(*args, **kw)
     me._set = set
     me._clear = clear
     super(CommandRemoteService, me).__init__(*args, **kw)
     me._set = set
     me._clear = clear

diff --git a/util.py b/util.py
index 49bd11f1f34a00832decf0e2febf656ad94f2eee..6384fd5386941d0f74e68bf88e29005736f4da25 100644 (file)
--- a/util.py
+++ b/util.py
@@ -551,9 +551,7 @@ class SimpleDBConnection (object):
     return row
 
   def __enter__(me):
     return row
 
   def __enter__(me):

-    """
-    Context protocol: begin a transaction.
-    """
+    """Context protocol: begin a transaction."""

     ##PRINT('<<< BEGIN')
     return
   def __exit__(me, exty, exval, tb):
     ##PRINT('<<< BEGIN')
     return
   def __exit__(me, exty, exval, tb):