requestsync: reindent remaining code and small cleanup

requestsync

@@ -26,76 +26,76 @@
 #
 # ##################################################################
 
-import os
-import subprocess
 import sys
-from debian_bundle.changelog import Version
 from optparse import OptionParser
+from debian_bundle.changelog import Version
 
-# ubuntu-dev-tools modules.
-import ubuntutools.lp.libsupport as lp_libsupport
-import ubuntutools.lp.udtexceptions as udtexceptions
-from ubuntutools.lp.lpapicache import Launchpad, LpApiWrapper, Distribution, PersonTeam
+# ubuntu-dev-tools modules
+from ubuntutools.lp import udtexceptions
+from ubuntutools.requestsync.common import *
 # https_proxy fix
 import ubuntutools.common
 
-from ubuntutools.requestsync.mail import *
-from ubuntutools.requestsync.common import *
-from ubuntutools.requestsync.lp import postBug
-
 #
 # entry point
 #
 
 if __name__ == '__main__':
 	# Our usage options.
-    usage = "Usage: %prog [-d distro] [-k keyid] [-n] [--lp] [-s] [-e] "
-    usage += "<source package> [<target release> [base version]]"
+	usage = 'Usage: %prog [-d distro] [-k keyid] [-n] [--lp] [-s] [-e] ' \
+		'<source package> [<target release> [base version]]'
 	optParser = OptionParser(usage)
 
-    optParser.add_option("-d", type = "string",
-        dest = "dist", default = "unstable",
-        help = "Debian distribution to sync from.")
-    optParser.add_option("-k", type = "string",
-        dest = "keyid", default = None,
-        help = "GnuPG key ID to use for signing report.")
-    optParser.add_option("-n", action = "store_true",
-        dest = "newpkg", default = False,
-        help = "Whether package to sync is a new package in Ubuntu.")
-    optParser.add_option("--lp", action = "store_true",
-        dest = "lpbugs", default = False,
-        help = "Specify whether to use the launchpadlib module for filing " \
-            "report.")
-    optParser.add_option("-s", action = "store_true",
-        dest = "sponsor", default = False,
-        help = "Force sponsorship requirement (shall be autodetected if not " \
-            "specified).")
-    optParser.add_option("-e", action = "store_true",
-        dest = "ffe", default = False,
-        help = "Use this after FeatureFreeze for non-bug fix syncs, changes " \
-            "default subscription to the appropriate release team.")
+	optParser.add_option('-d', type = 'string',
+		dest = 'dist', default = 'unstable',
+		help = 'Debian distribution to sync from.')
+	optParser.add_option('-k', type = 'string',
+		dest = 'keyid', default = None,
+		help = 'GnuPG key ID to use for signing report (only used when emailing the sync request).')
+	optParser.add_option('-n', action = 'store_true',
+		dest = 'newpkg', default = False,
+		help = 'Whether package to sync is a new package in Ubuntu.')
+	optParser.add_option('--lp', action = 'store_true',
+		dest = 'lpapi', default = False,
+		help = 'Specify whether to use the LP API for filing the sync request.')
+	optParser.add_option('-s', action = 'store_true',
+		dest = 'sponsor', default = False,
+		help = 'Force sponsorship')
+	optParser.add_option('-e', action = 'store_true',
+		dest = 'ffe', default = False,
+		help = 'Use this after FeatureFreeze for non-bug fix syncs, changes ' \
+			'default subscription to the appropriate release team.')
 
 	(options, args) = optParser.parse_args()
 
+	if not len(args):
+		optParser.print_help()
+		sys.exit(1)
+
+	# import the needed requestsync module
+	if options.lpapi:
+		from ubuntutools.requestsync.lp import *
+		from ubuntutools.lp.lpapicache import Distribution
+	else:
+		from ubuntutools.requestsync.mail import *
+		if not getEmailAddress():
+			sys.exit(1)
+
 	newsource = options.newpkg
 	sponsorship = options.sponsor
 	keyid = options.keyid
-    use_lp_bugs = options.lpbugs
+	lpapi = options.lpapi
 	need_interaction = False
 	distro = options.dist
 	ffe = options.ffe
 
-    if not use_lp_bugs and not getEmailAddress():
-        sys.exit(1)
-
-    if len(args) == 0:
-        optParser.print_help()
-        sys.exit(1)
-
 	if len(args) not in (2, 3): # no release specified, assume development release
+		if options.lpapi:
 			release = Distribution('ubuntu').getDevelopmentSeries().name
-        print >> sys.stderr, ("Source package / target release missing - assuming %s " %
-            release)
+			print >> sys.stderr, 'W: Target release missing - assuming %s' % release
+		else:
+			print >> sys.stderr, 'E: Source package or target release missing. Exiting.'
+			sys.exit(1)
 	else:
 		release = args[1]
 
@@ -155,7 +155,6 @@ if __name__ == '__main__':
 		else:
 			subscribe = 'motu-release'
 
-
 	pkg_to_sync = '%s %s (%s) from Debian %s (%s)' % (srcpkg, deb_version, component, distro, debiancomponent)
 	title = "Sync %s" % pkg_to_sync
 	if ffe == True:
@@ -187,7 +186,6 @@ if __name__ == '__main__':
 	report += 'Explanation of FeatureFreeze exception:\n' + \
 		'>>> ENTER_EXPLANATION_HERE <<<\n\n'
 
-
 	# Check if they have a per-package upload permission.
 	if LpApiWrapper.isPerPackageUploader(srcpkg):
 		report += 'Note that I have per-package upload permissions for %s.\n\n' % srcpkg
@@ -209,18 +207,10 @@ if __name__ == '__main__':
 
 	# Post sync request using Launchpad interface:
 	srcpkg = not newsource and srcpkg or None
-    if use_lp_bugs:
+	if options.lpapi:
 		# Map status to the values expected by lp-bugs
 		mapping = {'new': 'New', 'confirmed': 'Confirmed'}
-        if postBug(srcpkg, subscribe, mapping[status], title, report):
-            sys.exit(0)
-        # Abort on error:
-        print 'Something went wrong. No sync request filed.'
-        sys.exit(1)
-
+		postBug(srcpkg, subscribe, mapping[status], title, report)
+	else:
 		# Mail sync request:
-    if mailBug(srcpkg, subscribe, status, title, report, keyid):
-        sys.exit(0)
-
-    print 'Something went wrong. No sync request filed.'
-    sys.exit(1)
+		mailBug(srcpkg, subscribe, status, title, report, keyid)