From 88abaa56cf78027dd7d2669f2a02d77d4c6f5362 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 19 Jan 2009 22:37:27 +0000 Subject: [PATCH] More module reorganzation. --- buildd | 12 +++++----- grab-attachments | 2 +- hugdaylist | 2 +- lp-set-dup | 4 ++-- manage-credentials | 2 +- massfile | 2 +- requestsync | 22 +++++++++---------- ubuntutools/lp/__init__.py | 3 +++ ubuntutools/{lpcookie.py => lp/cookie.py} | 0 .../{lplibfunctions.py => lp/functions.py} | 8 +++---- .../{lplibsupport.py => lp/libsupport.py} | 0 .../{lpurlopener.py => lp/urlopener.py} | 0 12 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 ubuntutools/lp/__init__.py rename ubuntutools/{lpcookie.py => lp/cookie.py} (100%) rename ubuntutools/{lplibfunctions.py => lp/functions.py} (86%) rename ubuntutools/{lplibsupport.py => lp/libsupport.py} (100%) rename ubuntutools/{lpurlopener.py => lp/urlopener.py} (100%) diff --git a/buildd b/buildd index 646825d..6c91f26 100755 --- a/buildd +++ b/buildd @@ -31,9 +31,9 @@ from optparse import OptionParser from urllib import urlencode # ubuntu-dev-tools modules. -from ubuntutools import lpcookie -from ubuntutools import lplibfunctions -from ubuntutools import lpurlopener +import ubuntutools.lp.cookie as lp_cookie +import ubuntutools.lp.functions as lp_functions +import ubuntutools.lp.urlopener as lp_urlopener from ubuntutools import packages # Usage. @@ -96,8 +96,8 @@ else: oneArch = False # Prepare Launchpad cookie. -launchpadCookie = lpcookie.prepareLaunchpadCookie() -urlopener = lpurlopener.setupLaunchpadUrlOpener(launchpadCookie) +launchpadCookie = lp_cookie.prepareLaunchpadCookie() +urlopener = lp_urlopener.setupLaunchpadUrlOpener(launchpadCookie) # Check the release exists. packages.checkReleaseExists(release) @@ -153,7 +153,7 @@ if op == "retry": else: teamNeeded = "ubuntu-dev" -necessaryPrivs = lplibfunctions.isLPTeamMember(teamNeeded) +necessaryPrivs = lp_functions.isLPTeamMember(teamNeeded) if not necessaryPrivs: print >> sys.stderr, "You cannot perform the %s operation on a %s package " \ diff --git a/grab-attachments b/grab-attachments index 368130d..57f8d66 100755 --- a/grab-attachments +++ b/grab-attachments @@ -20,7 +20,7 @@ import os import sys -from ubuntutools.lplibsupport import get_launchpad +from ubuntutools.lp.libsupport import get_launchpad USAGE = "grab-attachments " diff --git a/hugdaylist b/hugdaylist index d761893..e112292 100755 --- a/hugdaylist +++ b/hugdaylist @@ -35,7 +35,7 @@ import string import sys from optparse import OptionParser -from ubuntutools.lplibsupport import get_launchpad, translate_web_api, translate_api_web +from ubuntutools.lp.libsupport import get_launchpad, translate_web_api, translate_api_web def check_args(): howmany = -1 diff --git a/lp-set-dup b/lp-set-dup index c2efea0..9a4c3cd 100755 --- a/lp-set-dup +++ b/lp-set-dup @@ -25,7 +25,7 @@ import os, sys from optparse import OptionParser -from ubuntutools import lplibsupport +from ubuntutools.lp.libsupport as lp_libsupport def die(message): print >> sys.stderr, "Fatal: " + message @@ -46,7 +46,7 @@ if __name__ == '__main__': launchpad = None try: print "Setting up Launchpad" - launchpad = lplibsupport.get_launchpad("ubuntu-dev-tools") + launchpad = lp_libsupport.get_launchpad("ubuntu-dev-tools") print "Launchpad setup complete" except ImportError: suggestion = "check whether python-launchpadlib is installed" diff --git a/manage-credentials b/manage-credentials index 4380529..378647a 100755 --- a/manage-credentials +++ b/manage-credentials @@ -22,7 +22,7 @@ import os import sys from optparse import OptionParser, make_option -from ubuntutools.lplibsupport import * +from ubuntutools.lp.libsupport import * from ubuntutools.misc import mkdir class CmdOptions(OptionParser): diff --git a/massfile b/massfile index 8ba3db4..e01a537 100755 --- a/massfile +++ b/massfile @@ -29,7 +29,7 @@ import email import subprocess import glob -from ubuntutools.lplibsupport import get_launchpad, translate_api_web, translate_web_api +from ubuntutools.lp.libsupport import get_launchpad, translate_api_web, translate_web_api def read_config(): instructions_file = open("instructions") diff --git a/requestsync b/requestsync index e6f1575..572f43f 100755 --- a/requestsync +++ b/requestsync @@ -36,12 +36,12 @@ from optparse import OptionParser from time import sleep # ubuntu-dev-tools modules. -from ubuntutools import lpcookie -from ubuntutools import lplibfunctions -from ubuntutools import lplibsupport -from ubuntutools import lpurlopener +import ubuntutools.lp.cookie as lp_cookie +import ubuntutools.lp.functions as lp_functions +import ubuntutools.lp.libsupport as lp_libsupport +import ubuntutools.lp.urlopener as lp_urlopener -launchpad_cookiefile = lpcookie.prepareLaunchpadCookie() +launchpad_cookiefile = lp_cookie.prepareLaunchpadCookie() def checkNeedsSponsorship(component): """ @@ -62,7 +62,7 @@ def checkNeedsSponsorship(component): # >>> me = launchpad.me # >>> me.inTeam() #or # >>> me in - urlopener = lpurlopener.setupLaunchpadUrlOpener(launchpad_cookiefile) + urlopener = lp_urlopener.setupLaunchpadUrlOpener(launchpad_cookiefile) # Check where the package is and assign the appropriate variables. if component in ['main', 'restricted']: @@ -73,7 +73,7 @@ def checkNeedsSponsorship(component): sponsor = "ubuntu-universe-sponsors" # Check if they are a member of the team. - teamMember = lplibfunctions.isLPTeamMember(team) + teamMember = lp_functions.isLPTeamMember(team) if not teamMember: print "You are not a member (direct or indirect) of the '%s' " \ @@ -102,7 +102,7 @@ def checkExistingReports(package): launchpad = None try: - launchpad = lplibsupport.get_launchpad("ubuntu-dev-tools") + launchpad = lp_libsupport.get_launchpad("ubuntu-dev-tools") except ImportError: print >> sys.stderr, 'Importing launchpadlib failed. Is ' \ 'python-launchpadlib installed?' @@ -133,7 +133,7 @@ def checkExistingReports(package): for bug in matchingBugs: print " *", bug.title - print " -", lplibsupport.translate_api_web(bug.self_link) + print " -", lp_libsupport.translate_api_web(bug.self_link) print "Please check the above URLs to verify this before filing a " \ "possible duplicate report." @@ -352,7 +352,7 @@ def post_bug(source_package, subscribe, status, bugtitle, bugtext): import glob, os.path try: - launchpad = lplibsupport.get_launchpad("ubuntu-dev-tools") + launchpad = lp_libsupport.get_launchpad("ubuntu-dev-tools") except ImportError: print >> sys.stderr, 'Importing launchpadlib failed. Is python-launchpadlib installed?' return False @@ -396,7 +396,7 @@ def post_bug(source_package, subscribe, status, bugtitle, bugtext): bug.subscribe(person=subscribe_url) print 'Sync request filed as bug #%i: %s' % (bug.id, - lplibsupport.translate_api_web(bug.self_link)) + lp_libsupport.translate_api_web(bug.self_link)) return True def edit_report(subject, body, changes_required=False): diff --git a/ubuntutools/lp/__init__.py b/ubuntutools/lp/__init__.py new file mode 100644 index 0000000..17f4f3d --- /dev/null +++ b/ubuntutools/lp/__init__.py @@ -0,0 +1,3 @@ +## +## ubuntu-dev-tools Launchpad Python modules. +## diff --git a/ubuntutools/lpcookie.py b/ubuntutools/lp/cookie.py similarity index 100% rename from ubuntutools/lpcookie.py rename to ubuntutools/lp/cookie.py diff --git a/ubuntutools/lplibfunctions.py b/ubuntutools/lp/functions.py similarity index 86% rename from ubuntutools/lplibfunctions.py rename to ubuntutools/lp/functions.py index e84d920..dbe1d89 100644 --- a/ubuntutools/lplibfunctions.py +++ b/ubuntutools/lp/functions.py @@ -1,5 +1,5 @@ -import lpcookie -import lpurlopener +import cookie +import urlopener def isLPTeamMember(team): """ Checks if the user is a member of a certain team on Launchpad. @@ -15,9 +15,9 @@ def isLPTeamMember(team): # TODO: Check if launchpadlib may be a better way of doing this. # Prepare cookie. - cookieFile = lpcookie.prepareLaunchpadCookie() + cookieFile = cookie.prepareLaunchpadCookie() # Prepare URL opener. - urlopener = lpurlopener.setupLaunchpadUrlOpener(cookieFile) + urlopener = urlopener.setupLaunchpadUrlOpener(cookieFile) # Try to open the Launchpad team page: try: diff --git a/ubuntutools/lplibsupport.py b/ubuntutools/lp/libsupport.py similarity index 100% rename from ubuntutools/lplibsupport.py rename to ubuntutools/lp/libsupport.py diff --git a/ubuntutools/lpurlopener.py b/ubuntutools/lp/urlopener.py similarity index 100% rename from ubuntutools/lpurlopener.py rename to ubuntutools/lp/urlopener.py