Merge lp:~stub/launchpad/trivial into lp:launchpad

[Stuart Bishop]

[Stuart Bishop (stub)]

Make some antique scripts do 'import _pythonpath' so the buildout configured path is used.

Also update the copyright strings and fix lint issues in these files.

[Paul Hummer (rockstar)]

review: Approve

[lp:~stub/launchpad/trivial]

8682. By Launchpad PQM Bot on 2009-06-18

[r=rockstar][ui=none][bug=389065] All scripts need to import _pythonpath to function correctly with buildout

=== modified file 'database/schema/diagram.py'
--- database/schema/diagram.py	2007-05-03 12:40:20 +0000
+++ database/schema/diagram.py	2009-06-18 16:40:24 +0000
@@ -1,11 +1,13 @@
 #!/usr/bin/python2.4
-# Copyright 2004-2005 Canonical Ltd.  All rights reserved.
+# Copyright 2004-2009 Canonical Ltd.  All rights reserved.
 
 __metaclass__ = type
 
+# pylint: disable-msg=W0403
+import _pythonpath
+
 import psycopg, sys, os, re
 from sets import Set
-from fti import quote_identifier
 from security import DbSchema, CursorWrapper
 from ConfigParser import SafeConfigParser, NoOptionError
 
@@ -95,7 +97,7 @@
 
     for i in xrange(0, len(lines)):
         line = lines[i]
-        
+
         # Trim tables we don't want to see
         m = re.search(r'^\s* "(.+?)" \s+ \[shape', line, re.X)
         if m is not None:
@@ -124,17 +126,17 @@
         if t1 not in wanted_tables:
             lines[i] = ''
             continue
-        
+
         # Links to ourself are fine, unless the table is not wanted
         if t1 == t2:
             continue
-        
+
         # Get allowed links
         allowed_link = True
         if t2 not in wanted_tables:
             allowed_link = False
         else:
-            for source, end in [ (t1,t2), (t2,t1) ]:
+            for source, end in [(t1, t2), (t2, t1)]:
                 try:
                     allowed = config.get(section, source)
                 except NoOptionError:
@@ -180,7 +182,7 @@
             rv.append(dst)
     return rv
 
-        
+
 def main(filetypes):
 
     print filetypes
@@ -249,6 +251,3 @@
 
     main(ft)
 
-# List all foreign key constraints
-# select pg_namespace.nspname as ns,src.relname as src,dst.relname as dst from pg_constraint,pg_namespace,pg_class as src,pg_class as dst where pg_namespace.oid = connamespace and src.oid = conrelid and dst.oid = confrelid;
-

=== modified file 'database/schema/online_fti_updater.py'
--- database/schema/online_fti_updater.py	2007-03-20 03:24:02 +0000
+++ database/schema/online_fti_updater.py	2009-06-18 16:40:24 +0000
@@ -1,12 +1,15 @@
 #!/usr/bin/python2.4
-# Copyright 2006 Canonical Ltd.  All rights reserved.
+# Copyright 2006-2009 Canonical Ltd.  All rights reserved.
 """
 Rebuild the full text indexes in a more friendly fashion, enabling this to
 be done without downtime.
 """
 __metaclass__ = type
 
-from fti import ALL_FTI, quote_identifier
+# pylint: disable-msg=W0403
+import _pythonpath
+
+from fti import ALL_FTI
 import psycopg
 
 def main():

=== modified file 'database/schema/reset_sequences.py'
--- database/schema/reset_sequences.py	2007-03-20 03:24:02 +0000
+++ database/schema/reset_sequences.py	2009-06-18 16:40:24 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/python2.4
-# Copyright 2004-2005 Canonical Ltd.  All rights reserved.
+# Copyright 2004-2009 Canonical Ltd.  All rights reserved.
 """
 The sampledata does not update the current values of all the sequences
 used to populate the primary keys (this was removed to aid in merging changes
@@ -11,10 +11,8 @@
 
 __metaclass__ = type
 
-import sys, os, os.path
-sys.path.insert(
-        0, os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'lib')
-        )
+# pylint: disable-msg=W0403
+import _pythonpath
 
 from optparse import OptionParser
 from canonical.database.postgresql import resetSequences

=== modified file 'database/schema/security.py'
--- database/schema/security.py	2009-04-17 10:32:16 +0000
+++ database/schema/security.py	2009-06-18 16:40:24 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/python2.4
-# Copyright 2004-2005 Canonical Ltd.  All rights reserved.
+# Copyright 2004-2009 Canonical Ltd.  All rights reserved.
 
 __metaclass__ = type
 

=== modified file 'database/schema/sort_sql.py'
--- database/schema/sort_sql.py	2007-03-20 03:24:02 +0000
+++ database/schema/sort_sql.py	2009-06-18 16:40:24 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/python2.4
-# Copyright 2005 Canonical Ltd. All rights reserved.
+# Copyright 2005-2009 Canonical Ltd. All rights reserved.
 
 """Script to sort SQL dumps.
 
@@ -24,9 +24,10 @@
 
 __metaclass__ = type
 
-import sys, os, os.path
-sys.path.insert(0, os.path.join(
-    os.path.dirname(__file__), os.pardir, os.pardir, 'lib'))
+# pylint: disable-msg=W0403
+import _pythonpath
+
+import sys
 
 from canonical.launchpad.scripts.sort_sql import Parser, print_lines_sorted
 

=== modified file 'database/schema/upgrade.py'
--- database/schema/upgrade.py	2009-04-17 10:32:16 +0000
+++ database/schema/upgrade.py	2009-06-18 16:40:24 +0000
@@ -1,12 +1,12 @@
 #!/usr/bin/python2.4
-# Copyright 2004-2008 Canonical Ltd.  All rights reserved.
-# pylint: disable-msg=W0403
+# Copyright 2004-2009 Canonical Ltd.  All rights reserved.
 """
 Apply all outstanding schema patches to an existing launchpad database
 """
 
 __metaclass__ = type
 
+# pylint: disable-msg=W0403
 import _pythonpath # Sort PYTHONPATH
 
 from cStringIO import StringIO