Simplifications resulting from requiring Python 2.5 and therefore being able to use...

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / _auto_deps.py

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 5bb2c0c282a20f2445e66b6a2ff87e8b069fef9b..3b602e1a69e3cbe8a7d4bc89ece7796af1d5e2b2 100644 (file)
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -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