From: | "Ali Polatel (hawking)" <hawking@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-python/axiom/files: axiom-0.5.20-sqlite3.patch digest-axiom-0.5.20 |
Date: | Fri, 02 Nov 2007 18:38:02 |
Message-Id: | E1Io1P2-0000HX-SL@stork.gentoo.org |
1 | hawking 07/11/02 18:37:56 |
2 | |
3 | Added: axiom-0.5.20-sqlite3.patch digest-axiom-0.5.20 |
4 | Log: |
5 | Version bump. |
6 | (Portage version: 2.1.3.16) |
7 | |
8 | Revision Changes Path |
9 | 1.1 dev-python/axiom/files/axiom-0.5.20-sqlite3.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/axiom/files/axiom-0.5.20-sqlite3.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/axiom/files/axiom-0.5.20-sqlite3.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: axiom-0.5.20-sqlite3.patch |
15 | =================================================================== |
16 | --- axiom/_pysqlite2.py 2006-07-05 18:31:18.000000000 +0300 |
17 | +++ axiom/_pysqlite2.py 2007-11-02 05:10:45.000000000 +0200 |
18 | @@ -8,7 +8,11 @@ |
19 | """ |
20 | import time |
21 | |
22 | -from pysqlite2 import dbapi2 |
23 | +# Use python2.5's sqlite3 if avaliable |
24 | +try: |
25 | + from sqlite3 import dbapi2 |
26 | +except: |
27 | + from pysqlite2 import dbapi2 |
28 | |
29 | from twisted.python import log |
30 | |
31 | --- axiom/test/test_pysqlite2.py 2006-07-02 19:23:40.000000000 +0300 |
32 | +++ axiom/test/test_pysqlite2.py 2007-11-02 05:39:44.000000000 +0200 |
33 | @@ -2,7 +2,11 @@ |
34 | Test cases for PySQLite2-specific parts of the backend. |
35 | """ |
36 | |
37 | -from pysqlite2.dbapi2 import OperationalError |
38 | +# Use python2.5's sqlite3 if avaliable |
39 | +try: |
40 | + from sqlite3.dbapi2 import OperationalError |
41 | +except: |
42 | + from pysqlite2.dbapi2 import OperationalError |
43 | |
44 | from twisted.trial.unittest import TestCase |
45 | |
46 | --- axiom/test/test_xatop.py 2007-02-23 02:09:19.000000000 +0200 |
47 | +++ axiom/test/test_xatop.py 2007-11-02 05:38:48.000000000 +0200 |
48 | @@ -9,7 +9,11 @@ |
49 | from axiom import attributes, item, store, errors |
50 | from axiom.errors import ItemNotFound |
51 | |
52 | -from pysqlite2.dbapi2 import sqlite_version_info |
53 | +# Use python2.5's sqlite3 if avaliable |
54 | +try: |
55 | + from sqlite3.dbapi2 import sqlite_version_info |
56 | +except: |
57 | + from pysqlite2.dbapi2 import sqlite_version_info |
58 | |
59 | |
60 | class RevertException(Exception): |
61 | |
62 | |
63 | |
64 | 1.1 dev-python/axiom/files/digest-axiom-0.5.20 |
65 | |
66 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/axiom/files/digest-axiom-0.5.20?rev=1.1&view=markup |
67 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/axiom/files/digest-axiom-0.5.20?rev=1.1&content-type=text/plain |
68 | |
69 | Index: digest-axiom-0.5.20 |
70 | =================================================================== |
71 | MD5 c91059c65a4fda8955d45892b201dc5e Axiom-0.5.20.tar.gz 153887 |
72 | RMD160 b78bbb681b3497e91700dab33fbb612cddbd5b06 Axiom-0.5.20.tar.gz 153887 |
73 | SHA256 2655a1917151211c6f8e291a132588ea453d957ceb72a1d08a4844c11601b53c Axiom-0.5.20.tar.gz 153887 |
74 | |
75 | |
76 | |
77 | -- |
78 | gentoo-commits@g.o mailing list |