ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 23:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplifications resulting from requiring Python 2.5 and therefore being able to use sqlite3 from the standard library. This also drops sqlite3 from the set of versions and paths we report.

Browse Source
This commit is contained in:
david-sarah
2012-05-16 02:47:25 +00:00
parent 0fc196ea5f
commit a1a1b5bf8a
6 changed files with 81 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/allmydata/_auto_deps.py
View File

@ -80,17 +80,6 @@ package_imports = [
def require_more():
import sys
# Sqlite comes built into Python >= 2.5, and is provided by the "pysqlite"
# distribution for Python 2.4.
try:
import sqlite3
sqlite3 # hush pyflakes
package_imports.append(('sqlite3', 'sqlite3'))
except ImportError:
# pysqlite v2.0.5 was shipped in Ubuntu 6.06 LTS "dapper" and Nexenta NCP 1.
install_requires.append("pysqlite >= 2.0.5")
package_imports.append(('pysqlite', 'pysqlite2.dbapi2'))
# Don't try to get the version number of setuptools in frozen builds, because
# that triggers 'site' processing that causes failures. Note that frozen
# builds still (unfortunately) import pkg_resources in .tac files, so the