ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-25 21:59:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setup: add pysqlite and sqlite to get_package_versions()

Browse Source
This commit is contained in:
Zooko O'Whielacronx 2009-06-04 08:37:28 -07:00
parent 35b3f7f426
commit 2841d6a266
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/allmydata/__init__.py
View File

@ -133,10 +133,29 @@ def get_platform():
return platform.platform() return platform.platform()
def get_package_versions_and_locations(): def get_package_versions_and_locations():
# because there are a few dependencies that are outside setuptools's ken (Python and # because there are a few dependencies that are outside setuptools's ken
# platform), and because setuptools might fail to find something even though import finds # (Python and platform, and sqlite3 if you are on Python >= 2.5), and
# it: # because setuptools might fail to find something even though import
# finds it:
import OpenSSL, allmydata, foolscap.api, nevow, platform, pycryptopp, setuptools, simplejson, twisted, zfec, zope.interface import OpenSSL, allmydata, foolscap.api, nevow, platform, pycryptopp, setuptools, simplejson, twisted, zfec, zope.interface
pysqlitever = None
pysqlitefile = None
sqlitever = None
try:
import sqlite3
except ImportError:
try:
from pysqlite2 import dbapi2
except ImportError:
pass
else:
pysqlitever = dbapi2.version
pysqlitefile = os.path.dirname(dbapi2.__file__)
sqlitever = dbapi2.sqlite_version
else:
pysqlitever = sqlite3.version
pysqlitefile = os.path.dirname(sqlite3.__file__)
sqlitever = sqlite3.sqlite_version
d1 = { d1 = {
'pyOpenSSL': (OpenSSL.__version__, os.path.dirname(OpenSSL.__file__)), 'pyOpenSSL': (OpenSSL.__version__, os.path.dirname(OpenSSL.__file__)),
@ -146,6 +165,8 @@ def get_package_versions_and_locations():
'pycryptopp': (pycryptopp.__version__, os.path.dirname(pycryptopp.__file__)), 'pycryptopp': (pycryptopp.__version__, os.path.dirname(pycryptopp.__file__)),
'setuptools': (setuptools.__version__, os.path.dirname(setuptools.__file__)), 'setuptools': (setuptools.__version__, os.path.dirname(setuptools.__file__)),
'simplejson': (simplejson.__version__, os.path.dirname(simplejson.__file__)), 'simplejson': (simplejson.__version__, os.path.dirname(simplejson.__file__)),
'pysqlite': (pysqlitever, pysqlitefile),
'sqlite': (sqlitever, 'unknown'),
'zope.interface': ('unknown', os.path.dirname(zope.interface.__file__)), 'zope.interface': ('unknown', os.path.dirname(zope.interface.__file__)),
'Twisted': (twisted.__version__, os.path.dirname(twisted.__file__)), 'Twisted': (twisted.__version__, os.path.dirname(twisted.__file__)),
'zfec': (zfec.__version__, os.path.dirname(zfec.__file__)), 'zfec': (zfec.__version__, os.path.dirname(zfec.__file__)),

5
src/allmydata/scripts/backupdb.py
View File

@ -1,8 +1,9 @@
# the backupdb is only available if sqlite3 is available. Python-2.5.x and # the backupdb is only available if sqlite3 is available. Python-2.5.x and
# beyond include sqlite3 in the standard library. For python-2.4, the # beyond include sqlite3 in the standard library. For python-2.4, the
# "pysqlite2" package (which, despite the confusing name, uses sqlite3) must # "pysqlite2" "package" (or "module") (which, despite the confusing name, uses
# be installed. On debian, install python-pysqlite2 # sqlite3, and which, confusingly, comes in the "pysqlite" "distribution" (or
# "package")) must be installed. On debian, install python-pysqlite2
import os.path, sys, time, random, stat import os.path, sys, time, random, stat