subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kot...@apache.org
Subject svn commit: r1816730 - /subversion/trunk/subversion/tests/cmdline/svntest/__init__.py
Date Thu, 30 Nov 2017 16:37:49 GMT
Author: kotkov
Date: Thu Nov 30 16:37:49 2017
New Revision: 1816730

URL: http://svn.apache.org/viewvc?rev=1816730&view=rev
Log:
* subversion/tests/cmdline/svntest/__init__.py
  (): Remove a fallback import of the external sqlite module.  It was
   required for compatibility with Python 2.4, where sqlite3 was only
   available as an external module.  Python 2.5+ includes a standard
   sqlite3 module and the minimal required Python version is 2.7.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/__init__.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/__init__.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/__init__.py?rev=1816730&r1=1816729&r2=1816730&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/__init__.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/__init__.py Thu Nov 30 16:37:49 2017
@@ -35,11 +35,8 @@ if sys.hexversion < 0x2070000:
 try:
   import sqlite3
 except ImportError:
-  try:
-    from pysqlite2 import dbapi2 as sqlite3
-  except ImportError:
-    sys.stderr.write('[SKIPPED] Python sqlite3 module required\n')
-    sys.exit(0)
+  sys.stderr.write('[SKIPPED] Python sqlite3 module required\n')
+  sys.exit(0)
 
 # don't export this name
 del sys



Mime
View raw message