Commit Graph

82 Commits

Author SHA1 Message Date
Benjamin Peterson a6d018ad6e merge 3.3 (#20901) 2014-03-12 21:52:19 -05:00
Benjamin Peterson 966f2fca5f weaken callback count inequality (closes #20901) 2014-03-12 21:51:52 -05:00
Benjamin Peterson 5ef48d9c79 merge 3.3 (#20080) 2014-02-15 13:20:28 -05:00
Benjamin Peterson 29352c436c add missing test assertion (closes #20080)
Patch by Vajrasky Kok.
2014-02-15 13:19:59 -05:00
Victor Stinner 08263f10f8 (Merge 3.3) Issue #20026: Fix the sqlite module to handle correctly invalid
isolation level (wrong type).
2013-12-19 16:39:00 +01:00
Victor Stinner cb1f74ec40 Issue #20026: Fix the sqlite module to handle correctly invalid isolation level
(wrong type).
2013-12-19 16:38:03 +01:00
Serhiy Storchaka d4b75bf63e Issue #19601: Use specific asserts in sqlite3 tests. 2013-11-17 00:40:01 +02:00
Serhiy Storchaka 78ee078405 Issue #19601: Use specific asserts in sqlite3 tests. 2013-11-17 00:39:12 +02:00
Ezio Melotti e0c69161bc #18741: merge with 3.3. 2013-08-17 16:13:22 +03:00
Ezio Melotti b5bc353b88 #18741: fix more typos. Patch by Févry Thibault. 2013-08-17 16:11:40 +03:00
Brett Cannon cd171c8e92 Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a) 2013-07-04 17:43:24 -04:00
Brett Cannon 0a140668fa Issue #18200: Update the stdlib (except tests) to use
ModuleNotFoundError.
2013-06-13 20:57:26 -04:00
Petri Lehtinen e55aa69efc Issue #14720: Enhance sqlite3 microsecond conversion, document its behavior 2013-02-26 21:46:12 +02:00
Petri Lehtinen 6401ad66a7 Issue #14720: Enhance sqlite3 microsecond conversion, document its behavior 2013-02-26 21:45:09 +02:00
Petri Lehtinen 5f79409889 Issue #14720: Enhance sqlite3 microsecond conversion, document its behavior 2013-02-26 21:38:17 +02:00
Petri Lehtinen e460f26b25 Issue #14720: sqlite3: Convert datetime microseconds correctly 2013-02-23 19:10:29 +01:00
Petri Lehtinen f484efdb60 Issue #14720: sqlite3: Convert datetime microseconds correctly 2013-02-23 19:09:45 +01:00
Petri Lehtinen 8b945148e3 Issue #14720: sqlite3: Convert datetime microseconds correctly
Patch by Lowe Thiderman
2013-02-23 19:05:56 +01:00
Antoine Pitrou 902fc8b5a0 Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the filename as a URI, allowing to pass custom options. 2013-02-10 00:02:44 +01:00
Serhiy Storchaka 2efdc90b0f Issue #17073: Fix some integer overflows in sqlite3 module. 2013-02-07 17:03:46 +02:00
Serhiy Storchaka 3cf96ac248 Issue #17073: Fix some integer overflows in sqlite3 module. 2013-02-07 17:01:47 +02:00
R David Murray d394455aae merge #13934: document sqlite version strings, use correct one in test. 2013-01-10 20:19:35 -05:00
R David Murray 3f7beb99dd #13934: document sqlite version strings, use correct one in test. 2013-01-10 20:18:21 -05:00
R David Murray 7bd04867e5 merge #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.
The fix for issue 9750 introduced a regression by sorting the row objects
returned by fetchall.  But if a row_factory such as sqlite3.Row is used, the
rows may not be sortable (in Python3), which leads to an exception.  The
sorting is still a nice idea, so the patch moves the sort into the sql.

Fix and test by Peter Otten.
2013-01-10 11:13:34 -05:00
R David Murray b52312923b #15545: fix sqlite3.iterdump regression on unsortable row_factory objects.
The fix for issue 9750 introduced a regression by sorting the row objects
returned by fetchall.  But if a row_factory such as sqlite3.Row is used, the
rows may not be sortable (in Python3), which leads to an exception.  The
sorting is still a nice idea, so the patch moves the sort into the sql.

Fix and test by Peter Otten.
2013-01-10 11:04:09 -05:00
Petri Lehtinen 8b24506534 Merge branch '3.2'
Closes #8033.
2012-02-21 13:59:40 +02:00
Petri Lehtinen 4fe85abab9 sqlite3: Fix 64-bit integer handling in user functions on 32-bit architectures
Closes #8033.
2012-02-21 13:49:50 +02:00
Petri Lehtinen aa2c670ee6 Merge branch '3.2'
Closes #11689.
2012-02-17 21:36:52 +02:00
Petri Lehtinen c86d9e2846 Fix a variable scoping error in an sqlite3 test
Closes #11689.
2012-02-17 21:31:02 +02:00
Petri Lehtinen c7551a16c7 Merge branch '3.2'
Closes #9750
2012-02-12 21:06:57 +02:00
Petri Lehtinen 51d04d1ba8 Fix sqlite3.Connection.iterdump on tables/fields with reserved names or quotes
Closes #9750
2012-02-12 21:05:31 +02:00
Petri Lehtinen bc35bebb45 Undocument and clean up sqlite3.OptimizedUnicode
Closes #13921.
2012-02-09 21:09:03 +02:00
Petri Lehtinen 4a84f58143 Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. 2012-02-06 22:04:18 +02:00
Petri Lehtinen f854799d84 Make sqlite3 tests editable with Emacs
Change the coding declaration from ISO-8859-1 to iso-8859-1. Emacs
doesn't understand the former.
2012-02-02 20:47:59 +02:00
Petri Lehtinen 8940f6242c Merge branch 3.2
Closes #13676.
2012-02-01 22:21:05 +02:00
Petri Lehtinen 023fe334bb sqlite3: Handle strings with embedded zeros correctly
Closes #13676.
2012-02-01 22:18:35 +02:00
Victor Stinner 502ff6c920 Issue #10811: Use TestCase.assertRaises() in the new test 2011-05-09 12:50:41 +02:00
Gerhard Haering 936d518dc8 #10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now. 2011-05-09 12:24:09 +02:00
Antoine Pitrou f4e181029f Fix TraceCallbackTests to not use bound parameters (followup to issue #11688) 2011-04-04 01:50:50 +02:00
Antoine Pitrou 43b21687a5 Improve error message in test 2011-04-04 00:50:01 +02:00
Antoine Pitrou 5bfa0622ec Issue #11688: Add sqlite3.Connection.set_trace_callback(). Patch by Torsten Landschoff. 2011-04-04 00:12:04 +02:00
Marc-André Lemburg 8f36af7a4c Normalize the encoding names for Latin-1 and UTF-8 to
'latin-1' and 'utf-8'.

These are optimized in the Python Unicode implementation
to result in more direct processing, bypassing the codec
registry.

Also see issue11303.
2011-02-25 15:42:01 +00:00
Ezio Melotti b3aedd4862 #9424: Replace deprecated assert* methods in the Python test suite. 2010-11-20 19:04:17 +00:00
Florent Xicluna e01de8f2f3 remove pointless coding cookies 2010-08-30 14:05:50 +00:00
R. David Murray d35251dc19 #8845: expose sqlite3 inTransaction as RO in_transaction Connection attribute.
Patch by R. David Murray, unit tests by Shashwat Anand.
2010-06-01 01:32:12 +00:00
Victor Stinner 45df820591 Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80552 | victor.stinner | 2010-04-27 23:46:03 +0200 (mar., 27 avril 2010) | 3 lines

  Issue #7449, part 1: fix test_support.py for Python compiled without thread
........
  r80553 | victor.stinner | 2010-04-27 23:47:01 +0200 (mar., 27 avril 2010) | 1 line

  Issue #7449, part 2: regrtest.py -j option requires thread support
........
  r80554 | victor.stinner | 2010-04-27 23:51:26 +0200 (mar., 27 avril 2010) | 9 lines

  Issue #7449 part 3, test_doctest: import trace module in test_coverage()

  Import trace module fail if the threading module is missing. test_coverage() is
  only used if test_doctest.py is used with the -c option. This commit allows to
  execute the test suite without thread support.

  Move "import trace" in test_coverage() and use
  test_support.import_module('trace').
........
  r80555 | victor.stinner | 2010-04-27 23:56:26 +0200 (mar., 27 avril 2010) | 6 lines

  Issue #7449, part 4: skip test_multiprocessing if thread support is disabled

  import threading after _multiprocessing to raise a more revelant error message:
  "No module named _multiprocessing". _multiprocessing is not compiled without
  thread support.
........
  r80556 | victor.stinner | 2010-04-28 00:01:24 +0200 (mer., 28 avril 2010) | 8 lines

  Issue #7449, part 5: split Test.test_open() of ctypes/test/test_errno.py

   * Split Test.test_open() in 2 functions: test_open() and test_thread_open()
   * Skip test_open() and test_thread_open() if we are unable to find the C
     library
   * Skip test_thread_open() if thread support is disabled
   * Use unittest.skipUnless(os.name == "nt", ...) on test_GetLastError()
........
  r80564 | victor.stinner | 2010-04-28 00:59:35 +0200 (mer., 28 avril 2010) | 4 lines

  Issue #7449, part 6: fix test_hashlib for missing threading module

  Move @test_support.reap_thread decorator from test_main() to test_threaded_hashing().
........
  r80565 | victor.stinner | 2010-04-28 01:01:29 +0200 (mer., 28 avril 2010) | 6 lines

  Issue #7449, part 7: simplify threading detection in test_capi

   * Skip TestPendingCalls if threading module is missing
   * Test if threading module is present or not, instead of test the presence of
     _testcapi._test_thread_state
........
  r80566 | victor.stinner | 2010-04-28 01:03:16 +0200 (mer., 28 avril 2010) | 4 lines

  Issue #7449, part 8: don't skip the whole test_asynchat if threading is missing

  TestFifo can be executed without the threading module
........
  r80568 | victor.stinner | 2010-04-28 01:14:58 +0200 (mer., 28 avril 2010) | 6 lines

  Issue #7449, part 9: fix test_xmlrpclib for missing threading module

   * Skip testcases using threads if threading module is missing
   * Use "http://" instead of URL in ServerProxyTestCase if threading is missing
     because URL is not set in this case
........
  r80569 | victor.stinner | 2010-04-28 01:33:58 +0200 (mer., 28 avril 2010) | 6 lines

  Partial revert of r80556 (Issue #7449, part 5, fix ctypes test)

  Rewrite r80556: the thread test have to be executed just after the test on
  libc_open() and so the test cannot be splitted in two functions (without
  duplicating code, and I don't want to duplicate code).
........
  r80570 | victor.stinner | 2010-04-28 01:51:16 +0200 (mer., 28 avril 2010) | 8 lines

  Issue #7449, part 10: test_cmd imports trace module using test_support.import_module()

  Use test_support.import_module() instead of import to raise a SkipTest
  exception if the import fail. Import trace fails if the threading module is
  missing.

  See also part 3: test_doctest: import trace module in test_coverage().
........
  r80571 | victor.stinner | 2010-04-28 01:55:59 +0200 (mer., 28 avril 2010) | 6 lines

  Issue #7449, last part (11): fix many tests if thread support is disabled

   * Use try/except ImportError or test_support.import_module() to import thread
     and threading modules
   * Add @unittest.skipUnless(threading, ...) to testcases using threads
........
2010-04-28 22:31:17 +00:00
Victor Stinner 35466c5bce Issue #8195: Fix a crash in sqlite Connection.create_collation() if the
collation name contains a surrogate character.
2010-04-22 11:23:23 +00:00
Victor Stinner 0201f443f6 Merged revisions 78898 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78898 | victor.stinner | 2010-03-13 04:27:07 +0100 (sam., 13 mars 2010) | 7 lines

  sqlite3: Fix a segfault on calling a connection with something else than a
  string. Initialize all attributes to be able to call the statement destructor
  on error.

  Avoid also a duplicate connection in some tests: setUp() does already open a
  connection (":memory:").
........
2010-03-13 03:28:34 +00:00
Gerhard Häring f9cee22446 Merged new pysqlite version 2.6.0 from trunk. 2010-03-05 15:20:03 +00:00
Ezio Melotti 78ea2023d8 Merged revisions 74754 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74754 | ezio.melotti | 2009-09-12 17:43:43 +0300 (Sat, 12 Sep 2009) | 1 line

  #6026 - fix tests that failed without zlib
........
2009-09-12 18:41:20 +00:00