Merge lp:~salgado/launchpad/remove-policy_options into lp:launchpad

[Guilherme Salgado]

Remove lp.archiveuploader.uploadpolicy.policy_options, which was not used anywhere

[Jelmer Vernooij (jelmer)]

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
--- lib/lp/archiveuploader/uploadpolicy.py	2010-02-05 15:06:28 +0000
+++ lib/lp/archiveuploader/uploadpolicy.py	2010-06-24 11:48:37 +0000
@@ -25,37 +25,6 @@
 HOURS = 3600
 
 
-def policy_options(optparser):
-    """Add to the optparser all the options which can be used by the policy
-    objects herein.
-    """
-
-    optparser.add_option(
-        "-C", "--context", action="store", dest="context",
-        metavar="CONTEXT", default="insecure",
-        help="The context in which to consider the upload.")
-
-    optparser.add_option(
-        "-d", "--distro", action="store",
-        dest="distro", metavar="DISTRO", default="ubuntu",
-        help="Distribution to give back from")
-
-    optparser.add_option(
-        "-s", "--series", action="store", default=None,
-        dest="distroseries", metavar="DISTROSERIES",
-        help="Distro series to give back from.")
-
-    optparser.add_option(
-        "-b", "--buildid", action="store", type="int",
-        dest="buildid", metavar="BUILD",
-        help="The build ID to which to attach this upload.")
-
-    optparser.add_option(
-        "-a", "--announce", action="store",
-        dest="announcelist", metavar="ANNOUNCELIST",
-        help="Override the announcement list")
-
-
 class UploadPolicyError(Exception):
     """Raised when a specific policy violation occurs."""
 

=== modified file 'scripts/process-upload.py'
--- scripts/process-upload.py	2010-04-27 19:48:39 +0000
+++ scripts/process-upload.py	2010-06-24 11:48:37 +0000
@@ -11,9 +11,6 @@
 
 import _pythonpath
 
-# XXX: This import is not actually used, but it avoids a major circular import
-# problem. We love you too, Python.
-from lp.archiveuploader.uploadpolicy import policy_options
 from canonical.config import config
 from lp.soyuz.scripts.soyuz_process_upload import ProcessUpload