sqlobject-cvs Mailing List for SQLObject (Page 23)
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
Menu
▾
▴
sqlobject-cvs — CVS notification
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(9) |
Apr
(74) |
May
(29) |
Jun
(16) |
Jul
(28) |
Aug
(10) |
Sep
(57) |
Oct
(9) |
Nov
(29) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(7) |
Feb
(14) |
Mar
(6) |
Apr
(3) |
May
(12) |
Jun
(34) |
Jul
(9) |
Aug
(29) |
Sep
(22) |
Oct
(2) |
Nov
(15) |
Dec
(52) |
| 2005 |
Jan
(47) |
Feb
(78) |
Mar
(14) |
Apr
(35) |
May
(33) |
Jun
(16) |
Jul
(26) |
Aug
(63) |
Sep
(40) |
Oct
(96) |
Nov
(96) |
Dec
(123) |
| 2006 |
Jan
(159) |
Feb
(144) |
Mar
(64) |
Apr
(31) |
May
(88) |
Jun
(48) |
Jul
(16) |
Aug
(64) |
Sep
(87) |
Oct
(92) |
Nov
(56) |
Dec
(76) |
| 2007 |
Jan
(94) |
Feb
(103) |
Mar
(126) |
Apr
(123) |
May
(85) |
Jun
(11) |
Jul
(130) |
Aug
(47) |
Sep
(65) |
Oct
(70) |
Nov
(12) |
Dec
(11) |
| 2008 |
Jan
(30) |
Feb
(55) |
Mar
(88) |
Apr
(20) |
May
(50) |
Jun
|
Jul
(38) |
Aug
(1) |
Sep
(9) |
Oct
(5) |
Nov
(6) |
Dec
(39) |
| 2009 |
Jan
(8) |
Feb
(16) |
Mar
(3) |
Apr
(33) |
May
(44) |
Jun
(1) |
Jul
(10) |
Aug
(33) |
Sep
(74) |
Oct
(22) |
Nov
|
Dec
(15) |
| 2010 |
Jan
(28) |
Feb
(22) |
Mar
(46) |
Apr
(29) |
May
(1) |
Jun
(1) |
Jul
(27) |
Aug
(8) |
Sep
(5) |
Oct
(33) |
Nov
(24) |
Dec
(41) |
| 2011 |
Jan
(4) |
Feb
(12) |
Mar
(35) |
Apr
(29) |
May
(19) |
Jun
(16) |
Jul
(32) |
Aug
(25) |
Sep
(5) |
Oct
(11) |
Nov
(21) |
Dec
(12) |
| 2012 |
Jan
(3) |
Feb
(4) |
Mar
(20) |
Apr
(4) |
May
(25) |
Jun
(13) |
Jul
|
Aug
|
Sep
(2) |
Oct
(25) |
Nov
(9) |
Dec
(1) |
| 2013 |
Jan
(6) |
Feb
(8) |
Mar
|
Apr
(10) |
May
(31) |
Jun
(7) |
Jul
(18) |
Aug
(33) |
Sep
(4) |
Oct
(16) |
Nov
|
Dec
(27) |
| 2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
(11) |
May
(39) |
Jun
(8) |
Jul
(11) |
Aug
(4) |
Sep
|
Oct
(27) |
Nov
|
Dec
(71) |
| 2015 |
Jan
(17) |
Feb
(47) |
Mar
(33) |
Apr
|
May
|
Jun
(9) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(8) |
| 2016 |
Jan
(4) |
Feb
(4) |
Mar
|
Apr
|
May
(12) |
Jun
(7) |
Jul
(9) |
Aug
(31) |
Sep
(8) |
Oct
(3) |
Nov
(15) |
Dec
(1) |
| 2017 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(8) |
May
(10) |
Jun
(4) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(8) |
Nov
(4) |
Dec
(5) |
| 2018 |
Jan
(2) |
Feb
(8) |
Mar
|
Apr
(4) |
May
|
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2019 |
Jan
(1) |
Feb
(16) |
Mar
(1) |
Apr
(3) |
May
(5) |
Jun
(1) |
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(2) |
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
(1) |
Nov
(1) |
Dec
(4) |
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(3) |
Sep
(2) |
Oct
(2) |
Nov
(4) |
Dec
|
| 2024 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(9) |
| 2025 |
Jan
|
Feb
(4) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(2) |
Dec
(2) |
|
From: <sub...@co...> - 2014-05-04 15:15:38
|
Author: phd
Date: Sun May 4 09:15:29 2014
New Revision: 4714
Log:
Remove support for microseconds
Modified:
SQLObject/branches/1.6/docs/News.txt
SQLObject/branches/1.6/sqlobject/col.py
SQLObject/branches/1.6/sqlobject/converters.py
SQLObject/branches/1.6/sqlobject/tests/test_converters.py
SQLObject/branches/1.6/sqlobject/tests/test_datetime.py
Modified: SQLObject/branches/1.6/docs/News.txt
==============================================================================
--- SQLObject/branches/1.6/docs/News.txt Sun Apr 13 06:12:41 2014 (r4713)
+++ SQLObject/branches/1.6/docs/News.txt Sun May 4 09:15:29 2014 (r4714)
@@ -16,14 +16,6 @@
* Python 2.4 is no longer supported. The minimal supported version is
Python 2.5.
-* DateTimeCol and TimeCol preserve microseconds. The feature requires
- Python 2.6+ because in Python 2.5 datetime.strptime doesn't support
- '%f' format.
-
- WARNING: backward compatibility problem! Date/Time columns created
- with microseconds cannot be read back with older versions of
- SQLObject.
-
* Upgrade ez_setup to 1.4.2.
* A bugfix was ported from `SQLObject 1.5.2`_.
Modified: SQLObject/branches/1.6/sqlobject/col.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/col.py Sun Apr 13 06:12:41 2014 (r4713)
+++ SQLObject/branches/1.6/sqlobject/col.py Sun May 4 09:15:29 2014 (r4714)
@@ -20,9 +20,7 @@
from array import array
from itertools import count
-import re
-import sys
-import time
+import re, time
try:
import cPickle as pickle
except ImportError:
@@ -1100,27 +1098,11 @@
else:
return datetime.time(value.hour, value.minute, int(value.second))
try:
- if self.format.find(".%f") >= 0:
- if '.' in value:
- _value = value.split('.')
- microseconds = _value[-1]
- _l = len(microseconds)
- if _l < 6:
- _value[-1] = '%06d' % int(microseconds)
- elif _l > 6:
- _value[-1] = microseconds[:6]
- if _l != 6:
- value = '.'.join(_value)
- else:
- value += '.0'
- if sys.version_info[:3] < (2, 6, 0): # datetime.strptime in python2.5 doesn't support '%f' format
- stime = time.strptime(value, self.format)
- return datetime.datetime(*stime[:6])
- else:
- return datetime.datetime.strptime(value, self.format)
+ stime = time.strptime(value, self.format)
except:
raise validators.Invalid("expected a date/time string of the '%s' format in the DateTimeCol '%s', got %s %r instead" % \
(self.format, self.name, type(value), value), value, state)
+ return datetime.datetime(*stime[:6])
def from_python(self, value, state):
if value is None:
@@ -1147,29 +1129,11 @@
elif isinstance(value, datetime.time):
return DateTime.Time(value.hour, value.minute, value.second)
try:
- if self.format.find(".%f") >= 0:
- if '.' in value:
- _value = value.split('.')
- microseconds = _value[-1]
- _l = len(microseconds)
- if _l < 6:
- _value[-1] = '%06d' % int(microseconds)
- elif _l > 6:
- _value[-1] = microseconds[:6]
- if _l != 6:
- value = '.'.join(_value)
- else:
- value += '.0'
- if sys.version_info[:3] < (2, 6, 0): # datetime.strptime in python2.5 doesn't support '%f' format
- stime = time.strptime(value, self.format)
- return DateTime.mktime(stime)
- else:
- value = datetime.datetime.strptime(value, self.format)
- return DateTime.DateTime(value.year, value.month, value.day,
- value.hour, value.minute, value.second)
+ stime = time.strptime(value, self.format)
except:
raise validators.Invalid("expected a date/time string of the '%s' format in the DateTimeCol '%s', got %s %r instead" % \
(self.format, self.name, type(value), value), value, state)
+ return DateTime.mktime(stime)
def from_python(self, value, state):
if value is None:
@@ -1182,7 +1146,7 @@
(self.name, type(value), value), value, state)
class SODateTimeCol(SOCol):
- datetimeFormat = '%Y-%m-%d %H:%M:%S.%f'
+ datetimeFormat = '%Y-%m-%d %H:%M:%S'
def __init__(self, **kw):
datetimeFormat = kw.pop('datetimeFormat', None)
@@ -1313,7 +1277,7 @@
from_python = to_python
class SOTimeCol(SOCol):
- timeFormat = '%H:%M:%S.%f'
+ timeFormat = '%H:%M:%S'
def __init__(self, **kw):
timeFormat = kw.pop('timeFormat', None)
Modified: SQLObject/branches/1.6/sqlobject/converters.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/converters.py Sun Apr 13 06:12:41 2014 (r4713)
+++ SQLObject/branches/1.6/sqlobject/converters.py Sun May 4 09:15:29 2014 (r4714)
@@ -7,11 +7,16 @@
try:
+ import mx.DateTime.ISO
+ origISOStr = mx.DateTime.ISO.strGMT
from mx.DateTime import DateTimeType, DateTimeDeltaType
except ImportError:
try:
+ import DateTime.ISO
+ origISOStr = DateTime.ISO.strGMT
from DateTime import DateTimeType, DateTimeDeltaType
except ImportError:
+ origISOStr = None
DateTimeType = None
DateTimeDeltaType = None
@@ -36,6 +41,17 @@
('\t', '\\t'),
]
+def isoStr(val):
+ """
+ Gets rid of time zone information
+ (@@: should we convert to GMT?)
+ """
+ val = origISOStr(val)
+ if val.find('+') == -1:
+ return val
+ else:
+ return val[:val.find('+')]
+
class ConverterRegistry:
def __init__(self):
@@ -117,12 +133,12 @@
if DateTimeType:
def DateTimeConverter(value, db):
- return "'%s'" % value.strftime("%Y-%m-%d %H:%M:%S.%s")
+ return "'%s'" % isoStr(value)
registerConverter(DateTimeType, DateTimeConverter)
def TimeConverter(value, db):
- return "'%s'" % value.strftime("%H:%M:%S")
+ return "'%s'" % value.strftime("%T")
registerConverter(DateTimeDeltaType, TimeConverter)
@@ -151,9 +167,9 @@
registerConverter(time.struct_time, StructTimeConverter)
def DateTimeConverter(value, db):
- return "'%04d-%02d-%02d %02d:%02d:%02d.%d'" % (
+ return "'%04d-%02d-%02d %02d:%02d:%02d'" % (
value.year, value.month, value.day,
- value.hour, value.minute, value.second, value.microsecond)
+ value.hour, value.minute, value.second)
registerConverter(datetime.datetime, DateTimeConverter)
@@ -163,7 +179,7 @@
registerConverter(datetime.date, DateConverter)
def TimeConverter(value, db):
- return "'%02d:%02d:%02d.%d'" % (value.hour, value.minute, value.second, value.microsecond)
+ return "'%02d:%02d:%02d'" % (value.hour, value.minute, value.second)
registerConverter(datetime.time, TimeConverter)
Modified: SQLObject/branches/1.6/sqlobject/tests/test_converters.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/tests/test_converters.py Sun Apr 13 06:12:41 2014 (r4713)
+++ SQLObject/branches/1.6/sqlobject/tests/test_converters.py Sun May 4 09:15:29 2014 (r4714)
@@ -88,11 +88,11 @@
def test_datetime():
from datetime import datetime, date, time
- assert sqlrepr(datetime(2005, 7, 14, 13, 31, 2)) == "'2005-07-14 13:31:02.0'"
+ assert sqlrepr(datetime(2005, 7, 14, 13, 31, 2)) == "'2005-07-14 13:31:02'"
assert sqlrepr(date(2005, 7, 14)) == "'2005-07-14'"
- assert sqlrepr(time(13, 31, 2)) == "'13:31:02.0'"
+ assert sqlrepr(time(13, 31, 2)) == "'13:31:02'"
# now dates before 1900
- assert sqlrepr(datetime(1428, 7, 14, 13, 31, 2)) == "'1428-07-14 13:31:02.0'"
+ assert sqlrepr(datetime(1428, 7, 14, 13, 31, 2)) == "'1428-07-14 13:31:02'"
assert sqlrepr(date(1428, 7, 14)) == "'1428-07-14'"
def test_instance():
Modified: SQLObject/branches/1.6/sqlobject/tests/test_datetime.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/tests/test_datetime.py Sun Apr 13 06:12:41 2014 (r4713)
+++ SQLObject/branches/1.6/sqlobject/tests/test_datetime.py Sun May 4 09:15:29 2014 (r4714)
@@ -25,8 +25,7 @@
assert dt1.col1.day == _now.day
assert dt1.col1.hour == _now.hour
assert dt1.col1.minute == _now.minute
- assert dt1.col1.second == _now.second
- assert dt1.col1.microsecond == _now.microsecond
+ assert dt1.col1.second == int(_now.second)
assert isinstance(dt1.col2, date)
assert not isinstance(dt1.col2, datetime)
@@ -37,8 +36,7 @@
assert isinstance(dt1.col3, time)
assert dt1.col3.hour == _now.hour
assert dt1.col3.minute == _now.minute
- assert dt1.col3.second == _now.second
- assert dt1.col3.microsecond == _now.microsecond
+ assert dt1.col3.second == int(_now.second)
if mxdatetime_available:
col.default_datetime_implementation = MXDATETIME_IMPLEMENTATION
@@ -49,7 +47,7 @@
if connection.dbName == "sqlite":
if connection.using_sqlite2:
# mxDateTime sends and PySQLite2 returns full date/time for dates
- dateFormat = "%Y-%m-%d %H:%M:%S.%f"
+ dateFormat = "%Y-%m-%d %H:%M:%S"
class DateTime2(SQLObject):
col1 = DateTimeCol()
@@ -59,7 +57,7 @@
def test_mxDateTime():
setupClass(DateTime2)
_now = now()
- dt2 = DateTime2(col1=_now, col2=_now, col3=Time(_now.hour, _now.minute, _now.second))
+ dt2 = DateTime2(col1=_now, col2=_now, col3=Time(_now.hour, _now.minute, int(_now.second)))
assert isinstance(dt2.col1, col.DateTimeType)
assert dt2.col1.year == _now.year
|
|
From: <sub...@co...> - 2014-04-13 12:12:48
|
Author: phd
Date: Sun Apr 13 06:12:41 2014
New Revision: 4713
Log:
SQLObject 1.6.0b1
Modified:
SQLObject/tags/1.6.0b1/README.txt
SQLObject/tags/1.6.0b1/setup.py
SQLObject/tags/1.6.0b1/sqlobject/__version__.py
Modified: SQLObject/tags/1.6.0b1/README.txt
==============================================================================
--- SQLObject/tags/1.6.0b1/README.txt Sun Apr 13 06:10:20 2014 (r4712)
+++ SQLObject/tags/1.6.0b1/README.txt Sun Apr 13 06:12:41 2014 (r4713)
@@ -1,5 +1,5 @@
-SQLObject 1.6
-=============
+SQLObject 1.6.0b1
+=================
Thanks for looking at SQLObject. SQLObject is an object-relational
mapper, i.e., a library that will wrap your database tables in Python
Modified: SQLObject/tags/1.6.0b1/setup.py
==============================================================================
--- SQLObject/tags/1.6.0b1/setup.py Sun Apr 13 06:10:20 2014 (r4712)
+++ SQLObject/tags/1.6.0b1/setup.py Sun Apr 13 06:12:41 2014 (r4713)
@@ -68,7 +68,7 @@
maintainer="Oleg Broytman",
maintainer_email="ph...@ph...",
url="http://sqlobject.org/",
- download_url="https://pypi.python.org/pypi/SQLObject/%s" % version,
+ download_url="https://pypi.python.org/pypi/SQLObject/1.6.0b1dev-r4713",
license="LGPL",
packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
Modified: SQLObject/tags/1.6.0b1/sqlobject/__version__.py
==============================================================================
--- SQLObject/tags/1.6.0b1/sqlobject/__version__.py Sun Apr 13 06:10:20 2014 (r4712)
+++ SQLObject/tags/1.6.0b1/sqlobject/__version__.py Sun Apr 13 06:12:41 2014 (r4713)
@@ -1,8 +1,8 @@
-version = '1.6'
+version = '1.6.0b1'
major = 1
minor = 6
micro = 0
-release_level = 'branch'
-serial = 0
+release_level = 'beta'
+serial = 1
version_info = (major, minor, micro, release_level, serial)
|
|
From: <sub...@co...> - 2014-04-13 12:10:27
|
Author: phd
Date: Sun Apr 13 06:10:20 2014
New Revision: 4712
Log:
Tagging 1.6.0b1
Added:
SQLObject/tags/1.6.0b1/
- copied from r4711, SQLObject/branches/1.6/
|
|
From: <sub...@co...> - 2014-04-13 11:58:42
|
Author: phd Date: Sun Apr 13 05:58:35 2014 New Revision: 4711 Log: Stable version 1.5.2 Modified: SQLObject/tags/1.5.2/README.txt SQLObject/tags/1.5.2/setup.cfg SQLObject/tags/1.5.2/sqlobject/__version__.py Modified: SQLObject/tags/1.5.2/README.txt ============================================================================== --- SQLObject/tags/1.5.2/README.txt Sun Apr 13 05:56:34 2014 (r4710) +++ SQLObject/tags/1.5.2/README.txt Sun Apr 13 05:58:35 2014 (r4711) @@ -1,5 +1,5 @@ -SQLObject 1.5 -============= +SQLObject 1.5.2 +=============== Thanks for looking at SQLObject. SQLObject is an object-relational mapper, i.e., a library that will wrap your database tables in Python Modified: SQLObject/tags/1.5.2/setup.cfg ============================================================================== --- SQLObject/tags/1.5.2/setup.cfg Sun Apr 13 05:56:34 2014 (r4710) +++ SQLObject/tags/1.5.2/setup.cfg Sun Apr 13 05:58:35 2014 (r4711) @@ -5,10 +5,6 @@ [easy_install] #find_links = http://svn.pythonpaste.org/package_index.html -[egg_info] -tag_build = dev -tag_svn_revision = true - [pudge] theme = pythonpaste.org docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt Modified: SQLObject/tags/1.5.2/sqlobject/__version__.py ============================================================================== --- SQLObject/tags/1.5.2/sqlobject/__version__.py Sun Apr 13 05:56:34 2014 (r4710) +++ SQLObject/tags/1.5.2/sqlobject/__version__.py Sun Apr 13 05:58:35 2014 (r4711) @@ -1,8 +1,8 @@ -version = '1.5' +version = '1.5.2' major = 1 minor = 5 -micro = 0 -release_level = 'branch' +micro = 2 +release_level = 'final' serial = 0 version_info = (major, minor, micro, release_level, serial) |
|
From: <sub...@co...> - 2014-04-13 11:56:40
|
Author: phd
Date: Sun Apr 13 05:56:34 2014
New Revision: 4710
Log:
Tagging 1.5.2
Added:
SQLObject/tags/1.5.2/
- copied from r4709, SQLObject/branches/1.5/
|
|
From: <sub...@co...> - 2014-04-13 11:55:46
|
Author: phd Date: Sun Apr 13 05:55:39 2014 New Revision: 4709 Log: SQLObject 1.6.0b1 and 1.5.2 were released 13 Apr 2014 Modified: SQLObject/trunk/docs/News.txt Modified: SQLObject/trunk/docs/News.txt ============================================================================== --- SQLObject/trunk/docs/News.txt Sun Apr 13 05:54:56 2014 (r4708) +++ SQLObject/trunk/docs/News.txt Sun Apr 13 05:55:39 2014 (r4709) @@ -34,6 +34,8 @@ SQLObject 1.5.2 =============== +Released 13 Apr 2014. + * Adapt duplicate error message strings for SQLite 3.8. SQLObject 1.5.1 |
|
From: <sub...@co...> - 2014-04-13 11:55:03
|
Author: phd Date: Sun Apr 13 05:54:56 2014 New Revision: 4708 Log: SQLObject 1.6.0b1 and 1.5.2 were released 13 Apr 2014 Modified: SQLObject/branches/1.6/docs/News.txt Modified: SQLObject/branches/1.6/docs/News.txt ============================================================================== --- SQLObject/branches/1.6/docs/News.txt Sun Apr 13 05:53:24 2014 (r4707) +++ SQLObject/branches/1.6/docs/News.txt Sun Apr 13 05:54:56 2014 (r4708) @@ -31,6 +31,8 @@ SQLObject 1.5.2 =============== +Released 13 Apr 2014. + * Adapt duplicate error message strings for SQLite 3.8. SQLObject 1.5.1 |
|
From: <sub...@co...> - 2014-04-13 11:53:32
|
Author: phd Date: Sun Apr 13 05:53:24 2014 New Revision: 4707 Log: SQLObject 1.5.2 was released 13 Apr 2014 Modified: SQLObject/branches/1.5/docs/News.txt Modified: SQLObject/branches/1.5/docs/News.txt ============================================================================== --- SQLObject/branches/1.5/docs/News.txt Sat Apr 12 14:49:47 2014 (r4706) +++ SQLObject/branches/1.5/docs/News.txt Sun Apr 13 05:53:24 2014 (r4707) @@ -10,6 +10,8 @@ SQLObject 1.5.2 =============== +Released 13 Apr 2014. + * Adapt duplicate error message strings for SQLite 3.8. SQLObject 1.5.1 |
|
From: <sub...@co...> - 2014-04-12 21:19:52
|
Author: phd
Date: Sat Apr 12 14:43:56 2014
New Revision: 4704
Log:
Merge revision 4703 from branch 1.5
Adapt duplicate error message strings for SQLite 3.8.
Modified:
SQLObject/branches/1.6/docs/News.txt
SQLObject/branches/1.6/sqlobject/sqlite/sqliteconnection.py
Modified: SQLObject/branches/1.6/docs/News.txt
==============================================================================
--- SQLObject/branches/1.6/docs/News.txt Sat Apr 12 14:38:07 2014 (r4703)
+++ SQLObject/branches/1.6/docs/News.txt Sat Apr 12 14:43:56 2014 (r4704)
@@ -26,6 +26,11 @@
* Upgrade ez_setup to 1.4.2.
+SQLObject 1.5.2
+===============
+
+* Adapt duplicate error message strings for SQLite 3.8.
+
SQLObject 1.5.1
===============
Modified: SQLObject/branches/1.6/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/sqlite/sqliteconnection.py Sat Apr 12 14:38:07 2014 (r4703)
+++ SQLObject/branches/1.6/sqlobject/sqlite/sqliteconnection.py Sat Apr 12 14:43:56 2014 (r4704)
@@ -210,7 +210,8 @@
raise OperationalError(ErrorMessage(e))
except self.module.IntegrityError, e:
msg = ErrorMessage(e)
- if msg.startswith('column') and msg.endswith('not unique'):
+ if msg.startswith('column') and msg.endswith('not unique') \
+ or msg.startswith('UNIQUE constraint failed:'):
raise DuplicateEntryError(msg)
else:
raise IntegrityError(msg)
|
|
From: <sub...@co...> - 2014-04-12 21:19:46
|
Author: phd Date: Sat Apr 12 14:47:05 2014 New Revision: 4705 Log: Document that it was ported from SQLObject 1.5.2 Modified: SQLObject/branches/1.6/docs/News.txt Modified: SQLObject/branches/1.6/docs/News.txt ============================================================================== --- SQLObject/branches/1.6/docs/News.txt Sat Apr 12 14:43:56 2014 (r4704) +++ SQLObject/branches/1.6/docs/News.txt Sat Apr 12 14:47:05 2014 (r4705) @@ -26,6 +26,8 @@ * Upgrade ez_setup to 1.4.2. +* A bugfix was ported from `SQLObject 1.5.2`_. + SQLObject 1.5.2 =============== |
|
From: <sub...@co...> - 2014-04-12 21:19:39
|
Author: phd
Date: Sat Apr 12 14:38:07 2014
New Revision: 4703
Log:
Adapt duplicate error message strings for SQLite 3.8
Modified:
SQLObject/branches/1.5/docs/News.txt
SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py
Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt Thu Jan 23 10:10:04 2014 (r4702)
+++ SQLObject/branches/1.5/docs/News.txt Sat Apr 12 14:38:07 2014 (r4703)
@@ -7,6 +7,11 @@
.. _start:
+SQLObject 1.5.2
+===============
+
+* Adapt duplicate error message strings for SQLite 3.8.
+
SQLObject 1.5.1
===============
Modified: SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py Thu Jan 23 10:10:04 2014 (r4702)
+++ SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py Sat Apr 12 14:38:07 2014 (r4703)
@@ -210,7 +210,8 @@
raise OperationalError(ErrorMessage(e))
except self.module.IntegrityError, e:
msg = ErrorMessage(e)
- if msg.startswith('column') and msg.endswith('not unique'):
+ if msg.startswith('column') and msg.endswith('not unique') \
+ or msg.startswith('UNIQUE constraint failed:'):
raise DuplicateEntryError(msg)
else:
raise IntegrityError(msg)
|
|
From: <sub...@co...> - 2014-04-12 21:19:32
|
Author: phd
Date: Sat Apr 12 14:49:47 2014
New Revision: 4706
Log:
Merge revisions 4704, 4705 from branch 1.6
Adapt duplicate error message strings for SQLite 3.8.
Modified:
SQLObject/trunk/docs/News.txt
SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt Sat Apr 12 14:47:05 2014 (r4705)
+++ SQLObject/trunk/docs/News.txt Sat Apr 12 14:49:47 2014 (r4706)
@@ -29,6 +29,13 @@
* Upgrade ez_setup to 1.4.2.
+* A bugfix was ported from `SQLObject 1.5.2`_.
+
+SQLObject 1.5.2
+===============
+
+* Adapt duplicate error message strings for SQLite 3.8.
+
SQLObject 1.5.1
===============
Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py Sat Apr 12 14:47:05 2014 (r4705)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py Sat Apr 12 14:49:47 2014 (r4706)
@@ -210,7 +210,8 @@
raise OperationalError(ErrorMessage(e))
except self.module.IntegrityError, e:
msg = ErrorMessage(e)
- if msg.startswith('column') and msg.endswith('not unique'):
+ if msg.startswith('column') and msg.endswith('not unique') \
+ or msg.startswith('UNIQUE constraint failed:'):
raise DuplicateEntryError(msg)
else:
raise IntegrityError(msg)
|
|
From: <sub...@co...> - 2014-01-23 17:10:15
|
Author: phd Date: Thu Jan 23 10:10:04 2014 New Revision: 4702 Log: Preserve the URL in the TODO For an attempt to port FormEncode to py3k see https://bitbucket.org/fetchinson/formencode-py3k Modified: SQLObject/trunk/docs/TODO.txt Modified: SQLObject/trunk/docs/TODO.txt ============================================================================== --- SQLObject/trunk/docs/TODO.txt Tue Jan 7 20:58:09 2014 (r4701) +++ SQLObject/trunk/docs/TODO.txt Thu Jan 23 10:10:04 2014 (r4702) @@ -81,7 +81,8 @@ * Deprecate, then remove connectionForOldURI. -* Python 3.0+. +* Python 3.0+. For an attempt to port FormEncode to py3k see + https://bitbucket.org/fetchinson/formencode-py3k * Switch from setuptools to distribute. |
|
From: <sub...@co...> - 2014-01-08 03:58:18
|
Author: phd Date: Tue Jan 7 20:58:09 2014 New Revision: 4701 Log: TODO: PyMySQL Modified: SQLObject/trunk/docs/TODO.txt Modified: SQLObject/trunk/docs/TODO.txt ============================================================================== --- SQLObject/trunk/docs/TODO.txt Wed Dec 25 08:40:32 2013 (r4700) +++ SQLObject/trunk/docs/TODO.txt Tue Jan 7 20:58:09 2014 (r4701) @@ -91,6 +91,8 @@ * Pure Python Mysql Interface: https://github.com/nasi/MyPy +* PyMySQL: https://github.com/PyMySQL/PyMySQL + * pg8000 driver: http://code.google.com/p/pg8000/ * py-postgresql driver: http://python.projects.postgresql.org/ |
|
From: <sub...@co...> - 2013-12-25 15:40:41
|
Author: phd
Date: Wed Dec 25 08:40:32 2013
New Revision: 4700
Log:
Going to release version 1.6.0a1
Modified:
SQLObject/tags/1.6.0a1/README.txt
SQLObject/tags/1.6.0a1/setup.py
SQLObject/tags/1.6.0a1/sqlobject/__version__.py
Modified: SQLObject/tags/1.6.0a1/README.txt
==============================================================================
--- SQLObject/tags/1.6.0a1/README.txt Wed Dec 25 08:30:00 2013 (r4699)
+++ SQLObject/tags/1.6.0a1/README.txt Wed Dec 25 08:40:32 2013 (r4700)
@@ -1,5 +1,5 @@
-SQLObject 1.6
-=============
+SQLObject 1.6.0a1
+=================
Thanks for looking at SQLObject. SQLObject is an object-relational
mapper, i.e., a library that will wrap your database tables in Python
Modified: SQLObject/tags/1.6.0a1/setup.py
==============================================================================
--- SQLObject/tags/1.6.0a1/setup.py Wed Dec 25 08:30:00 2013 (r4699)
+++ SQLObject/tags/1.6.0a1/setup.py Wed Dec 25 08:40:32 2013 (r4700)
@@ -68,7 +68,7 @@
maintainer="Oleg Broytman",
maintainer_email="ph...@ph...",
url="http://sqlobject.org/",
- download_url="https://pypi.python.org/pypi/SQLObject/%s" % version,
+ download_url="https://pypi.python.org/pypi/SQLObject/1.6.0a1dev-r4700",
license="LGPL",
packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
Modified: SQLObject/tags/1.6.0a1/sqlobject/__version__.py
==============================================================================
--- SQLObject/tags/1.6.0a1/sqlobject/__version__.py Wed Dec 25 08:30:00 2013 (r4699)
+++ SQLObject/tags/1.6.0a1/sqlobject/__version__.py Wed Dec 25 08:40:32 2013 (r4700)
@@ -1,8 +1,8 @@
-version = '1.6'
+version = '1.6.0a1'
major = 1
minor = 6
micro = 0
-release_level = 'branch'
-serial = 0
+release_level = 'alpha'
+serial = 1
version_info = (major, minor, micro, release_level, serial)
|
|
From: <sub...@co...> - 2013-12-25 15:30:07
|
Author: phd
Date: Wed Dec 25 08:30:00 2013
New Revision: 4699
Log:
Tagging 1.6.0a1
Added:
SQLObject/tags/1.6.0a1/
- copied from r4698, SQLObject/branches/1.6/
|
|
From: <sub...@co...> - 2013-12-25 15:27:16
|
Author: phd Date: Wed Dec 25 08:27:09 2013 New Revision: 4698 Log: Next version will be 1.7 Modified: SQLObject/trunk/README.txt SQLObject/trunk/sqlobject/__version__.py Modified: SQLObject/trunk/README.txt ============================================================================== --- SQLObject/trunk/README.txt Wed Dec 25 08:26:01 2013 (r4697) +++ SQLObject/trunk/README.txt Wed Dec 25 08:27:09 2013 (r4698) @@ -1,4 +1,4 @@ -SQLObject 1.6 +SQLObject 1.7 ============= Thanks for looking at SQLObject. SQLObject is an object-relational Modified: SQLObject/trunk/sqlobject/__version__.py ============================================================================== --- SQLObject/trunk/sqlobject/__version__.py Wed Dec 25 08:26:01 2013 (r4697) +++ SQLObject/trunk/sqlobject/__version__.py Wed Dec 25 08:27:09 2013 (r4698) @@ -1,7 +1,7 @@ -version = '1.6' +version = '1.7' major = 1 -minor = 6 +minor = 7 micro = 0 release_level = 'trunk' serial = 0 |
|
From: <sub...@co...> - 2013-12-25 15:26:08
|
Author: phd Date: Wed Dec 25 08:26:01 2013 New Revision: 4697 Log: This is a branch, not the trunk Modified: SQLObject/branches/1.6/docs/News.txt Modified: SQLObject/branches/1.6/docs/News.txt ============================================================================== --- SQLObject/branches/1.6/docs/News.txt Wed Dec 25 08:24:16 2013 (r4696) +++ SQLObject/branches/1.6/docs/News.txt Wed Dec 25 08:26:01 2013 (r4697) @@ -7,9 +7,6 @@ .. _start: -SQLObject (trunk) -================= - SQLObject 1.6.0 =============== |
|
From: <sub...@co...> - 2013-12-25 15:24:24
|
Author: phd
Date: Wed Dec 25 08:24:16 2013
New Revision: 4696
Log:
Merge revision 4695 from branch 1.6: minor optimization
Modified:
SQLObject/trunk/sqlobject/col.py
Modified: SQLObject/trunk/sqlobject/col.py
==============================================================================
--- SQLObject/trunk/sqlobject/col.py Wed Dec 25 08:19:53 2013 (r4695)
+++ SQLObject/trunk/sqlobject/col.py Wed Dec 25 08:24:16 2013 (r4696)
@@ -1107,7 +1107,7 @@
_l = len(microseconds)
if _l < 6:
_value[-1] = '%06d' % int(microseconds)
- if _l > 6:
+ elif _l > 6:
_value[-1] = microseconds[:6]
if _l != 6:
value = '.'.join(_value)
@@ -1154,7 +1154,7 @@
_l = len(microseconds)
if _l < 6:
_value[-1] = '%06d' % int(microseconds)
- if _l > 6:
+ elif _l > 6:
_value[-1] = microseconds[:6]
if _l != 6:
value = '.'.join(_value)
|
|
From: <sub...@co...> - 2013-12-25 15:20:02
|
Author: phd
Date: Wed Dec 25 08:19:53 2013
New Revision: 4695
Log:
Minor optimization
Modified:
SQLObject/branches/1.6/sqlobject/col.py
Modified: SQLObject/branches/1.6/sqlobject/col.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/col.py Tue Dec 24 06:19:58 2013 (r4694)
+++ SQLObject/branches/1.6/sqlobject/col.py Wed Dec 25 08:19:53 2013 (r4695)
@@ -1107,7 +1107,7 @@
_l = len(microseconds)
if _l < 6:
_value[-1] = '%06d' % int(microseconds)
- if _l > 6:
+ elif _l > 6:
_value[-1] = microseconds[:6]
if _l != 6:
value = '.'.join(_value)
@@ -1154,7 +1154,7 @@
_l = len(microseconds)
if _l < 6:
_value[-1] = '%06d' % int(microseconds)
- if _l > 6:
+ elif _l > 6:
_value[-1] = microseconds[:6]
if _l != 6:
value = '.'.join(_value)
|
|
From: <sub...@co...> - 2013-12-24 13:20:05
|
Author: phd Date: Tue Dec 24 06:19:58 2013 New Revision: 4694 Log: Branch 1.6 Modified: SQLObject/branches/1.6/setup.cfg SQLObject/branches/1.6/setup.py SQLObject/branches/1.6/sqlobject/__version__.py Modified: SQLObject/branches/1.6/setup.cfg ============================================================================== --- SQLObject/branches/1.6/setup.cfg Tue Dec 24 06:18:20 2013 (r4693) +++ SQLObject/branches/1.6/setup.cfg Tue Dec 24 06:19:58 2013 (r4694) @@ -40,6 +40,6 @@ make-dirs = 1 ## For live documentation: -# doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/ +doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/ ## For in-development documentation: -doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/devel/ +# doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/devel/ Modified: SQLObject/branches/1.6/setup.py ============================================================================== --- SQLObject/branches/1.6/setup.py Tue Dec 24 06:18:20 2013 (r4693) +++ SQLObject/branches/1.6/setup.py Tue Dec 24 06:19:58 2013 (r4694) @@ -67,7 +67,7 @@ author_email="ia...@co...", maintainer="Oleg Broytman", maintainer_email="ph...@ph...", - url="http://sqlobject.org/devel/", + url="http://sqlobject.org/", download_url="https://pypi.python.org/pypi/SQLObject/%s" % version, license="LGPL", packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages], Modified: SQLObject/branches/1.6/sqlobject/__version__.py ============================================================================== --- SQLObject/branches/1.6/sqlobject/__version__.py Tue Dec 24 06:18:20 2013 (r4693) +++ SQLObject/branches/1.6/sqlobject/__version__.py Tue Dec 24 06:19:58 2013 (r4694) @@ -3,6 +3,6 @@ major = 1 minor = 6 micro = 0 -release_level = 'trunk' +release_level = 'branch' serial = 0 version_info = (major, minor, micro, release_level, serial) |
|
From: <sub...@co...> - 2013-12-24 13:18:27
|
Author: phd
Date: Tue Dec 24 06:18:20 2013
New Revision: 4693
Log:
Branch 1.6
Added:
SQLObject/branches/1.6/
- copied from r4692, SQLObject/trunk/
|
|
From: <sub...@co...> - 2013-12-24 13:17:14
|
Author: phd Date: Tue Dec 24 06:17:07 2013 New Revision: 4692 Log: Going to create branch 1.6 Modified: SQLObject/trunk/docs/News.txt Modified: SQLObject/trunk/docs/News.txt ============================================================================== --- SQLObject/trunk/docs/News.txt Tue Dec 24 05:31:56 2013 (r4691) +++ SQLObject/trunk/docs/News.txt Tue Dec 24 06:17:07 2013 (r4692) @@ -10,6 +10,9 @@ SQLObject (trunk) ================= +SQLObject 1.6.0 +=============== + Features & Interface -------------------- |
|
From: <sub...@co...> - 2013-12-24 12:32:04
|
Author: phd
Date: Tue Dec 24 05:31:56 2013
New Revision: 4691
Log:
Fixed a bug: zero-pad microseconds at the left to exactly 6 chars
Modified:
SQLObject/trunk/sqlobject/col.py
Modified: SQLObject/trunk/sqlobject/col.py
==============================================================================
--- SQLObject/trunk/sqlobject/col.py Fri Dec 20 06:45:19 2013 (r4690)
+++ SQLObject/trunk/sqlobject/col.py Tue Dec 24 05:31:56 2013 (r4691)
@@ -1104,8 +1104,12 @@
if '.' in value:
_value = value.split('.')
microseconds = _value[-1]
- if len(microseconds) > 6:
+ _l = len(microseconds)
+ if _l < 6:
+ _value[-1] = '%06d' % int(microseconds)
+ if _l > 6:
_value[-1] = microseconds[:6]
+ if _l != 6:
value = '.'.join(_value)
else:
value += '.0'
@@ -1147,8 +1151,12 @@
if '.' in value:
_value = value.split('.')
microseconds = _value[-1]
- if len(microseconds) > 6:
+ _l = len(microseconds)
+ if _l < 6:
+ _value[-1] = '%06d' % int(microseconds)
+ if _l > 6:
_value[-1] = microseconds[:6]
+ if _l != 6:
value = '.'.join(_value)
else:
value += '.0'
|
|
From: <sub...@co...> - 2013-12-20 13:45:27
|
Author: phd
Date: Fri Dec 20 06:45:19 2013
New Revision: 4690
Log:
Add Oleg Broytman as the maintainer
maintainer_email="ph...@ph..."
Modified:
SQLObject/trunk/setup.py
Modified: SQLObject/trunk/setup.py
==============================================================================
--- SQLObject/trunk/setup.py Fri Dec 20 06:39:42 2013 (r4689)
+++ SQLObject/trunk/setup.py Fri Dec 20 06:45:19 2013 (r4690)
@@ -65,6 +65,8 @@
],
author="Ian Bicking",
author_email="ia...@co...",
+ maintainer="Oleg Broytman",
+ maintainer_email="ph...@ph...",
url="http://sqlobject.org/devel/",
download_url="https://pypi.python.org/pypi/SQLObject/%s" % version,
license="LGPL",
|
89 messages has been excluded from this view by a project administrator.
