Merge lp:~wgrant/launchpad/delete-more-stuff into lp:launchpad

[William Grant]

Remove more unused bits and pieces.

This removes a few more unused bits and pieces from around the tree:

 - Two broken Makefiles. lib/canonical/Makefile had its only statement commented out. lib/canonical/librarian/Makefile referenced long-gone TACs and obsolete directories -- it hasn't been useful or even worked for a long time.
 - lib/canonical/doap is long-obsolete, with its only remaining non-empty file being unused and unmodified since 2004.
 - lp.archivepublisher.library has been unused and broken for four or five years, with a comment at the top from four years ago suggesting that it be removed.
 - lib/psycopg.py raises an exception on import, and appears to date from the pyscopg2 migration days. Nothing has imported it in a long time, so it's just clutter now.
 - lib/canonical/not-used is... not used. It had a single empty directory inside it.

[Gavin Panella (allenap)]

review: Approve

=== removed file 'lib/canonical/Makefile'
--- lib/canonical/Makefile	2005-10-31 18:29:12 +0000
+++ lib/canonical/Makefile	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-check: 
-#	python ../../test_on_merge.py canonical.lp
-
-.PHONY: check
-

=== removed directory 'lib/canonical/doap'
=== removed file 'lib/canonical/doap/__init__.py'
--- lib/canonical/doap/__init__.py	2009-06-25 05:39:50 +0000
+++ lib/canonical/doap/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""This is the canonical.doap Python package.
-
-The DOAP (Description Of A Project) subsystem of Launchpad tracks projects,
-products, product releases and series' of releases.
-"""

=== removed file 'lib/canonical/doap/forage.py'
--- lib/canonical/doap/forage.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/doap/forage.py	1970-01-01 00:00:00 +0000
@@ -1,283 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Retrieve project details from sourceforge / freshmeat.
-
-import urllib2
-import re
-import string
-
-# Constants
-Error = 'sourceforge.py error'
-
-def getProjectSpec(project, repository='sf'):
-	page = ProjectPage(project, repository)
-	#page.makeDict()
-	return page.getDict()
-
-def makeURL(project, repository='sf'):
-	if repository=='sf':
-		url = 'http://sourceforge.net/projects/'+project+'/'
-	elif repository=='fm':
-		url = 'http://freshmeat.net/projects/'+project+'/'
-	else: raise Error, 'invalid repository: '+repository
-	return url
-
-def getHTML(url):
-	try: urlobj = urllib2.urlopen(url)
-	except urllib2.HTTPError: return None
-	html = urlobj.read()
-	urlobj.close()
-	return html
-
-def unobfuscate_fm_email(email):
-	delimiters = [[' [', '] '], [' |', '| '], [' (',') '], [' __','__ '], [' __dash__ ',' __dash__ '], [' |dash| ',' |dash| '], [' [dash] ',' [dash] '], [' (dash) ',' (dash) ']]
-	symbols = {'at': '@', 'dot': '.'}
-	for symbol in symbols.keys():
-		for delimiter in delimiters:
-			email = string.join(string.split(email, delimiter[0]+symbol+delimiter[1]), symbols[symbol])
-	return email
-
-class ProjectPage:
-	def __init__(self, project, repository='sf'):
-		self.project = project
-		self.repository = repository
-		self.url = makeURL(self.project, self.repository)
-		self.html = getHTML(self.url)
-		if self.html == None: raise Error, 'Could not retrieve project details - perhaps project not found on '+self.repository
-		self.theDict = {}
-		if self.repository == 'sf':
-			if string.find(self.html, 'Invalid Project') > -1:
-				raise Error, 'Project not found on '+self.repository
-		elif self.repository == 'fm':
-			if string.find(self.html, 'The project name you specified could not be found in our database') > -1:
-				raise Error, 'Project not found on '+self.repository
-		self.makeDict()
-
-	def getProjectName(self):
-		if self.repository == 'sf':
-			result = re.search('Project: .*Summary', self.html)
-			s = self.html[result.start()+9:result.end()-9]
-			return s
-		else:
-			return None
-
-
-	def getDescription(self):
-		if self.repository == 'sf':
-			start = string.find(self.html, 'Summary</A>')
-			if start == -1: return None
-			start = string.find(self.html, '<TABLE', start)
-			start = string.find(self.html, '<p>', start)
-			end = string.find(self.html, '<p>', start+1)
-			s = self.html[start+3:end]
-			s = string.strip(s)
-			s = string.join(string.split(s, '\r\n'), ' ')
-			return s
-		elif self.repository == 'fm':
-			start = string.find(self.html, '<b>About:</b>')
-			if start == -1: return None
-			start = string.find(self.html, '<br>', start)
-			end = string.find(self.html, '<p>', start)
-			s = self.html[start+4:end]
-			s = string.strip(s)
-			s = string.join(string.split(s, '\r\n'), ' ')
-			return s
-		else:
-			return None
-
-	def getHomePage(self):
-		if self.repository == 'sf':
-			result = re.search('href.*Home\ Page', self.html)
-			if result == None: return None
-			s = self.html[result.start()+6:result.end()-11]
-			return s
-		elif self.repository == 'fm':
-			start = string.find(self.html, 'Homepage:')
-			if start == -1: return None
-			start = string.find(self.html, 'http://', start)
-			end = string.find(self.html, '</a>', start)
-			return self.html[start:end]
-		else:
-			return None
-
-	def getProgramminglang(self):
-		if self.repository == 'sf':
-			result = re.search('Programming\ Language.*BR>', self.html)
-			if result == None: return None
-			langstring = self.html[result.start()+22:result.end()]
-			# Find first BR
-			end = string.find(langstring, '<BR>')
-			langstring = langstring[:end]
-			# split up, remove <A...> tags
-			langlist1 = string.split(langstring, ',')
-			langlist = []
-			for lang in langlist1:
-				start = string.find(lang, '>')
-				lang = lang[start+1:]
-				end = string.find(lang, '<')
-				lang = lang[:end]
-				langlist.append(lang)
-			return langlist
-		elif self.repository == 'fm':
-			start = string.find(self.html, '[Programming Language]')
-			if start == -1: return None
-			start = string.find(self.html, '<td', start)
-			start = string.find(self.html, '<td', start+1)
-			end = string.find(self.html, '</td>', start)
-			langstring = self.html[start:end]
-			langlist1 = string.split(langstring, ',')
-			langlist = []
-			for lang in langlist1:
-				start = string.find(lang, '<small>')
-				start = start + 8
-				end = string.find(lang, '<', start)
-				lang = lang[start:end]
-				langlist.append(lang)
-			return langlist
-		else:
-			return None
-
-	def getMailinglist(self):
-		# Check for mailing list page
-		if self.repository == 'sf':
-			start = string.find(self.html, '&nbsp;Mailing Lists</A>')
-			if start == -1: return None
-			start = string.rfind(self.html, '/mail/?', 0, start)
-			end = string.find(self.html, '"', start+1)
-			listURL = 'http://sourceforge.net' + self.html[start:end]
-			# fetch mailing list page
-			self.listpage = getHTML(listURL)
-			# Extract mailing list URLs
-			start = 0
-			urls = []
-			while start >= 0:
-				start = string.find(self.listpage, 'Subscribe/Unsubscribe/Preferences', start+1)
-				if start >= 0:
-					urlstart = string.rfind(self.listpage, 'http://lists.sourceforge', 0, start)
-					urlend = start - 2
-					url = self.listpage[urlstart:urlend]
-					urls.append(url)
-			# Construct return list
-			if urls: return urls
-			else: return None
-		elif self.repository == 'fm':
-			#
-			# Note: for FreshMeat, this currently only works for projects that point
-			# to a sourceforge page for the mailing lists.
-			# Other projects point to an arbitrary page somewhere else that
-			# cannot be parsed without further information.
-			#
-			start = string.find(self.html, 'Mailing list archive:</b>')
-			if start == -1: return None
-			end = string.find(self.html, '</a>', start)
-			start = string.find(self.html, 'http://sourceforge.net/mail/', start, end)
-			if start == -1: return None
-			listURL = self.html[start:end]
-			# fetch mailing list page
-			self.listpage = getHTML(listURL)
-			# Extract mailing list URLs
-			start = 0
-			urls = []
-			while start >= 0:
-				start = string.find(self.listpage, 'Subscribe/Unsubscribe/Preferences', start+1)
-				if start >= 0:
-					urlstart = string.rfind(self.listpage, 'http://lists.sourceforge', 0, start)
-					urlend = start - 2
-					url = self.listpage[urlstart:urlend]
-					urls.append(url)
-			# Construct return list
-			if urls: return urls
-			else: return None
-
-		else:
-			return None
-
-	def getScreenshot(self):
-		# only freshmeat has screenshots
-		if self.repository == 'sf':
-			return None
-		elif self.repository == 'fm':
-			start = string.find(self.html, '<a target="screenshot"')
-			if start == -1: return None
-			start = string.find(self.html, 'href="/screenshots/', start)
-			end = string.find(self.html, '/">', start)
-			ssurl = 'http://freshmeat.net' + self.html[start+6:end+1]
-			return ssurl
-		else: return None
-
-	def getDevels(self):
-		if self.repository == 'sf':
-			# We can get list of project admins with @sf.net emails
-			start = string.find(self.html, 'Project Admins:</SPAN>')
-			if start == -1: return None
-			end = string.find(self.html, '<SPAN CLASS="develtitle">Developers', start)
-			adminhtml = self.html[start:end]
-			admins = []
-			adminstart = 0
-			while adminstart >= 0:
-				adminstart = string.find(adminhtml, '<a href="/users/', adminstart + 1)
-				if adminstart >= 0:
-					adminend = string.find(adminhtml, '">', adminstart)
-					adminurl = adminhtml[adminstart+16:adminend-1]
-					admins.append(adminurl)
-			devels = {}
-			for admin in admins:
-				adminurl = 'http://sourceforge.net/users/' + admin + '/'
-				adminhtml = getHTML(adminurl)
-				namestart = string.find(adminhtml, 'Publicly Displayed Name:') + 39
-				nameend = string.find(adminhtml, '</B>', namestart)
-				name = adminhtml[namestart:nameend]
-				email = admin + '@users.sourceforge.net'
-				devels[name] = email
-			return devels
-		elif self.repository == 'fm':
-			# We can get a single author and obfuscated email address
-			start = string.find(self.html, '<b>Author:</b>')
-			if start == -1: return None
-			start = start + 18
-			endname = string.find(self.html, '<a href', start)
-			checkForAddrInName = string.find(self.html, '&lt;', start, endname)
-			if checkForAddrInName >= 0:
-				endname = checkForAddrInName
-			name = string.strip(self.html[start:endname])
-			emailstart = string.find(self.html, '<a href', start) + 16
-			emailend = string.find(self.html, '">', emailstart)
-			email = self.html[emailstart:emailend]
-			# unobfuscate email address
-			email = unobfuscate_fm_email(email)
-			return {name: email}
-		else: return None
-
-
-	def makeDict(self):
-		self.theDict = {}
-		self.theDict['project'] = self.project
-		#
-		projectname = self.getProjectName()
-		if projectname: self.theDict['projectname'] = projectname
-		#
-		homepage = self.getHomePage()
-		if homepage: self.theDict['homepage'] = homepage
-		#
-		programminglang = self.getProgramminglang()
-		if programminglang: self.theDict['programminglang'] = programminglang
-		else: self.theDict['programminglang'] = []
-		#
-		description = self.getDescription()
-		if description: self.theDict['description'] = description
-		#
-		mailinglist = self.getMailinglist()
-		if mailinglist: self.theDict['list'] = mailinglist
-		else: self.theDict['list'] = []
-		#
-		screenshot = self.getScreenshot()
-		if screenshot: self.theDict['screenshot'] = screenshot
-		#
-		devels = self.getDevels()
-		if devels: self.theDict['devels'] = devels
-		else: self.theDict['devels'] = {}
-
-	def getDict(self):
-		return self.theDict
-

=== removed directory 'lib/canonical/doap/ftests'
=== removed file 'lib/canonical/doap/ftests/__init__.py'
=== removed file 'lib/canonical/librarian/Makefile'
--- lib/canonical/librarian/Makefile	2010-04-22 17:30:35 +0000
+++ lib/canonical/librarian/Makefile	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-PYTHON_VERSION:=2.5
-TWISTD:=twistd$(PYTHON_VERSION)
-
-PYTHONPATH=../..
-pythonpath=PYTHONPATH=$(PYTHONPATH)
-
-default:
-
-tmpdirs=/tmp/fatsam/incoming
-
-$(tmpdirs):
-	mkdir -p $@
-
-run: $(tmpdirs)
-	$(pythonpath) $(TWISTD) -noy server.tac
-
-
-.PHONY: default run

=== removed directory 'lib/canonical/not-used'
=== removed directory 'lib/canonical/not-used/hctapi'
=== removed file 'lib/lp/archivepublisher/library.py'
--- lib/lp/archivepublisher/library.py	2010-02-09 00:17:40 +0000
+++ lib/lp/archivepublisher/library.py	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Librarian class is the Librarian wrapper that provides local file cache
-
-# XXX malcc 2006-08-03 bug=55031:
-# This looks bogus; looks like it's not used, and assumptions about
-# librarian URLs made here (and provided by the testing mocks) no longer
-# hold for the real librarian.
-# Can this whole file and its tests be squashed?
-
-from canonical.librarian.client import FileDownloadClient
-from canonical.librarian.client import FileUploadClient
-
-import os
-
-class Librarian (object):
-
-    def __init__(self, host, upload_port, download_port, cache):
-        self.librarian_host = host
-        self.upload_port = upload_port
-        self.download_port = download_port
-        self.cache_path = cache
-        if not os.access(cache, os.F_OK):
-            os.mkdir(cache)
-
-
-    def addFile(self, name, size, fileobj, contentType, digest=None,
-                cache=True, uploader=None):
-        """
-        Add a file to the librarian with optional LOCAL CACHE handy
-        optimisation same parameters of original addFile and an optional
-        cache
-
-        :param cache: Optional boolean in order to allow local cache of File
-        :param uploader: Optional FileUploadClient instance (usefull for test)
-        """
-        if not uploader:
-            uploader = FileUploadClient()
-
-        uploader.connect(self.librarian_host, self.upload_port)
-
-        fileid, filealias = uploader.addFile(name, size, fileobj,
-                                             contentType, digest)
-
-        if cache:
-            ## return to start of the file
-            fileobj.seek(0,0)
-            self.cacheFile(fileid, filealias, name, fileobj)
-
-        return fileid, filealias
-
-    def downloadFileToDisk(self, aliasID, archive, downloader=None):
-        """
-        Download a file from Librarian to our LOCAL CACHE and link to
-        a given file name (major work for publishing in our archive)
-
-        :param aliasID: Librarian aliasID
-        :param filename: resulted file (/cache/<aliasID> should be linked
-                         to filename)
-        :param downloader: Optional FileDownloadClient instance (useful for
-                           testing process)
-
-        """
-        if not downloader:
-            downloader = FileDownloadClient(self.librarian_host,
-                                            self.download_port)
-
-        path = downloader.getPathForAlias(aliasID)
-
-        # XXX: cprov 2004-11-22:
-        # The URL returned from Librarian must be correct
-        # first '/' results in garbage x !!!
-        x, fileid, filealias, name = path.split('/')
-
-        ## Verify if the file is already cached
-        if not self.isCached(path):
-            ## Grab file from Librarian
-            fp = downloader.getFileByAlias(aliasID)
-
-            ## Cache it
-            self.cacheFile(fileid, filealias, name, fp)
-
-        ##Link the cached file to the archive anyway, ensure it !!
-        path = os.path.join(self.cache_path, fileid, filealias, name)
-        self.linkFile(path, archive)
-
-
-    def cacheFile(self, fileid, filealias, name, fileobj):
-        ## efective creation of a file in fielsystem
-        # Don't spam the test runner please
-        #print 'Caching file', name
-        path = os.path.join(self.cache_path, fileid)
-        if not os.access(path, os.F_OK):
-            os.mkdir(path)
-        path = os.path.join(path, filealias)
-        if not os.access(path, os.F_OK):
-            os.mkdir(path)
-        filename = os.path.join(path, name)
-        cache = open(filename, "w")
-        content = fileobj.read()
-        cache.write(content)
-        cache.close()
-
-
-    def isCached(self, path):
-        filename = os.path.join(self.cache_path, path)
-        return os.access(filename, os.F_OK)
-
-    def linkFile(self, path, archive):
-        if os.path.exists(archive):
-            os.unlink(archive)
-        return os.link(path, archive)
-
-if __name__ == '__main__':
-    import hashlib
-    import os
-    import sys
-
-    lib = Librarian('localhost', 9090, 8000, "/tmp/cache")
-
-    name = sys.argv[1]
-    archive = sys.argv[2]
-
-    print 'Uploading', name, 'to %s:%s' %(lib.librarian_host,
-                                          lib.upload_port)
-    fileobj = open(name, 'rb')
-    size = os.stat(name).st_size
-    digest = hashlib.sha1(open(name, 'rb').read()).hexdigest()
-
-    fileid, filealias = lib.addFile(name, size, fileobj,
-                                    contentType='test/test',
-                                    digest=digest)
-
-    print 'Done.  File ID:',  fileid
-    print 'File AliasID:', filealias
-
-    lib.downloadFileToDisk(filealias, archive)
-
-    fp = open(archive, 'r')
-    print 'First 50 bytes:'
-    print repr(fp.read(50))
-
-
-

=== removed file 'lib/lp/archivepublisher/tests/test_librarianwrapper.py'
--- lib/lp/archivepublisher/tests/test_librarianwrapper.py	2010-02-09 00:17:40 +0000
+++ lib/lp/archivepublisher/tests/test_librarianwrapper.py	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for librarian wrapper (lp.archivepublisher.library.py)"""
-
-__metaclass__ = type
-
-import hashlib
-import os
-import shutil
-import sys
-import unittest
-
-from lp.archivepublisher.tests import datadir
-
-from lp.archivepublisher.tests.util import (
-    FakeDownloadClient, FakeUploadClient)
-
-
-class TestLibrarianWrapper(unittest.TestCase):
-
-    def setUp(self):
-        ## Create archive and cache dir ...
-        os.mkdir(datadir('archive'))
-        os.mkdir(datadir('cache'))
-
-    def tearDown(self):
-        shutil.rmtree(datadir('archive'))
-        shutil.rmtree(datadir('cache'))
-
-    def testImport(self):
-        """Librarian should be importable"""
-        from lp.archivepublisher.library import Librarian
-
-    def testInstatiate(self):
-        """Librarian should be instantiatable"""
-        from lp.archivepublisher.library import Librarian
-        lib = Librarian('localhost', 9090, 8000, datadir('cache'))
-
-    def testUpload(self):
-        """Librarian Upload"""
-        name = 'ed_0.2-20.dsc'
-        path = datadir(name)
-
-        from lp.archivepublisher.library import Librarian
-        lib = Librarian('localhost', 9090, 8000, datadir('cache'))
-
-        fileobj = open(path, 'rb')
-        size = os.stat(path).st_size
-        digest = hashlib.sha1(open(path, 'rb').read()).hexdigest()
-
-        ## Use Fake Librarian class
-        uploader = FakeUploadClient()
-
-        fileid, filealias = lib.addFile(name, size, fileobj,
-                                        contentType='test/test',
-                                        digest=digest,
-                                        uploader=uploader)
-        #print 'ID %s ALIAS %s' %(fileid, filealias)
-
-        cached = os.path.join(datadir('cache'), name)
-        os.path.exists(cached)
-
-    def testDownload(self):
-        """Librarian DownloadToDisk process"""
-        filealias = '1'
-        archive = os.path.join (datadir('archive'), 'test')
-
-        from lp.archivepublisher.library import Librarian
-        lib = Librarian('localhost', 9090, 8000, datadir('cache'))
-        ## Use Fake Librarian Class
-        downloader = FakeDownloadClient()
-
-        lib.downloadFileToDisk(filealias, archive, downloader=downloader)
-
-        os.path.exists(archive)
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/archivepublisher/tests/util.py'
--- lib/lp/archivepublisher/tests/util.py	2009-12-13 11:55:40 +0000
+++ lib/lp/archivepublisher/tests/util.py	2010-04-28 03:27:32 +0000
@@ -216,34 +216,6 @@
     return thing # Assume we can't copy it deeply
 
 
-class FakeDownloadClient:
-    """Fake up a FileDownloadClient for the tests"""
-    def __init__(self):
-        pass
-
-    def getFileByAlias(self, alias):
-        """Fake this up by returning data/aliases/alias"""
-        return file("%s/%s" % (datadir("aliases"), alias), "r")
-
-    def getPathForAlias(self, alias):
-        """Fake this up by returning the PATH 'alias/alias/alias'"""
-        return "/%s/%s/%s" % (alias, alias, alias)
-
-
-class FakeUploadClient:
-    """Fake up a FileUploadClient for the tests"""
-    def __init__(self):
-        pass
-
-    def connect(self, host, port):
-        pass
-
-    def addFile(self, name, size, fileobj, contentType, digest):
-        fileid = '1'
-        filealias = '1'
-        return fileid, filealias
-
-
 # NOTE: If you alter the configs here remember to add tests in test_config.py
 fake_ubuntu = FakeDistribution("ubuntu",
                         """

=== removed file 'lib/psycopg.py'
--- lib/psycopg.py	2009-06-25 05:59:58 +0000
+++ lib/psycopg.py	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""This is not Psycopg 1."""
-
-class Psycopg1Imported(ImportError):
-    pass
-
-raise Psycopg1Imported('Importing Psycopg 1.x is forbidden')