* Moved common.py to ubuntutools/ subdirectory to avoid possible conflicts

in Python packaging and fixed all imports as necessary.

buildd

@@ -31,8 +31,7 @@ from optparse import OptionParser
 from urllib import urlencode
 
 # ubuntu-dev-tools modules.
-sys.path.append("/usr/share/ubuntu-dev-tools/")
+from ubuntutools import common
-import common
 
 # Usage.
 usage = "%prog <srcpackage> <release> <operation>\n\n"

debian/changelog

@@ -5,6 +5,8 @@ ubuntu-dev-tools (0.56) UNRELEASED; urgency=low
   * common.py: Improved no credentials found error message to show which
     consumer token is needed.
   * requestsync: Catch credentials error to hide traceback.
+  * Moved common.py to ubuntutools/ subdirectory to avoid possible conflicts
+    in Python packaging and fixed all imports as necessary.
 
  -- Jonathan Davies <jpds@ubuntu.com>  Thu, 15 Jan 2009 12:35:12 +0000
 

grab-attachments

@@ -20,7 +20,7 @@
 
 import os
 import sys
-from common import get_launchpad
+from ubuntutools.common import get_launchpad
 
 USAGE = "grab-attachments <bug numbers>"
 

hugdaylist

@@ -35,7 +35,7 @@ import string
 import sys
 from optparse import OptionParser
 
-from common import get_launchpad, translate_web_api, translate_api_web
+from ubuntutools.common import get_launchpad, translate_web_api, translate_api_web
 
 def check_args():
     howmany = -1

manage-credentials

@@ -22,9 +22,9 @@
 import os
 import sys
 from optparse import OptionParser, make_option
-from common import Credentials, Launchpad, translate_service
+from ubuntutools.common import Credentials, Launchpad, translate_service
-from common import LEVEL, translate_api_web, approve_application
+from ubuntutools.common import LEVEL, translate_api_web, approve_application
-from common import mkdir
+from ubuntutools.common import mkdir
 
 class CmdOptions(OptionParser):
     

massfile

@@ -27,7 +27,7 @@ import email
 import subprocess
 import glob
 
-from common import get_launchpad, translate_api_web, translate_web_api
+from ubuntutools.common import get_launchpad, translate_api_web, translate_web_api
 
 def read_config():
     instructions_file = open("instructions")

pull-lp-source

@@ -33,8 +33,7 @@ import urllib2
 from optparse import OptionParser
 
 # Ubuntu-dev-tools modules.
-sys.path.append("/usr/share/ubuntu-dev-tools")
+from ubuntutools import common
-import common
 
 class BackportFromLP:
 

requestsync

@@ -35,7 +35,7 @@ from debian_bundle.changelog import Version
 from optparse import OptionParser
 from time import sleep
 
-import common
+from ubuntutools import common
     
 launchpad_cookiefile = common.prepareLaunchpadCookie()
 

setup.py

@@ -41,5 +41,4 @@ setup(name='ubuntu-dev-tools',
                'manage-credentials',
             ],
     packages=['ubuntutools'],
-    py_modules = ['common'],
 )