|
From: Oleg B. <no...@so...> - 2015-02-05 18:37:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via 6eabc0948f86083039f55c752a28022d7584f3f0 (commit)
via c8000d445dd39042d27acf250cad9259d7cce69a (commit)
via 7c664fbf69a1e19a2ae24e11f2ef8585df75b036 (commit)
via 6486cbea628913e0a3cef1f3f0f13ba156aeecfd (commit)
via a697f0f43f159d55ee365f55d1fc2087adec2e95 (commit)
from 4b8d897dbcacfa0b12378f18bfff7f1569a9acce (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/6eabc0948f86083039f55c752a28022d7584f3f0
commit 6eabc0948f86083039f55c752a28022d7584f3f0
Merge: 4b8d897 c8000d4
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 5 21:29:09 2015 +0300
Merge pull request #59 from drnlm/more_import_fixes
Issue #3: More import fixes
http://sourceforge.net/p/sqlobject/sqlobject/ci/c8000d445dd39042d27acf250cad9259d7cce69a
commit c8000d445dd39042d27acf250cad9259d7cce69a
Author: Neil <ne...@di...>
Date: Thu Feb 5 11:07:40 2015 +0200
Handle renamed thread module in python 3
diff --git a/sqlobject/sqlite/sqliteconnection.py b/sqlobject/sqlite/sqliteconnection.py
index 2f398c1..a62a9d8 100644
--- a/sqlobject/sqlite/sqliteconnection.py
+++ b/sqlobject/sqlite/sqliteconnection.py
@@ -1,6 +1,9 @@
import base64
import os
-import thread
+try:
+ from _thread import get_ident
+except ImportError:
+ from thread import get_ident
import urllib
from sqlobject.dbconnection import DBAPI, Boolean
from sqlobject import col
@@ -139,7 +142,7 @@ class SQLiteConnection(DBAPI):
self._connectionNumbers[id(conn)] = self._connectionCount
self._connectionCount += 1
return conn
- threadid = thread.get_ident()
+ threadid = get_ident()
if (self._pool is not None
and threadid in self._threadPool):
conn = self._threadPool[threadid]
http://sourceforge.net/p/sqlobject/sqlobject/ci/7c664fbf69a1e19a2ae24e11f2ef8585df75b036
commit 7c664fbf69a1e19a2ae24e11f2ef8585df75b036
Author: Neil <ne...@di...>
Date: Tue Feb 3 16:39:50 2015 +0200
Use relative imports in database connectors
diff --git a/sqlobject/firebird/__init__.py b/sqlobject/firebird/__init__.py
index b28e220..04201b4 100644
--- a/sqlobject/firebird/__init__.py
+++ b/sqlobject/firebird/__init__.py
@@ -2,7 +2,7 @@ from sqlobject.dbconnection import registerConnection
def builder():
- import firebirdconnection
+ from . import firebirdconnection
return firebirdconnection.FirebirdConnection
registerConnection(['firebird', 'interbase'], builder)
diff --git a/sqlobject/maxdb/__init__.py b/sqlobject/maxdb/__init__.py
index ec66af8..9f21914 100644
--- a/sqlobject/maxdb/__init__.py
+++ b/sqlobject/maxdb/__init__.py
@@ -2,7 +2,7 @@ from sqlobject.dbconnection import registerConnection
def builder():
- import maxdbconnection
+ from . import maxdbconnection
return maxdbconnection.MaxdbConnection
registerConnection(['maxdb', 'sapdb'], builder)
diff --git a/sqlobject/mssql/__init__.py b/sqlobject/mssql/__init__.py
index f266ffe..ca4c6f4 100644
--- a/sqlobject/mssql/__init__.py
+++ b/sqlobject/mssql/__init__.py
@@ -2,7 +2,7 @@ from sqlobject.dbconnection import registerConnection
def builder():
- import mssqlconnection
+ from . import mssqlconnection
return mssqlconnection.MSSQLConnection
registerConnection(['mssql'], builder)
diff --git a/sqlobject/mysql/__init__.py b/sqlobject/mysql/__init__.py
index 60215f5..19c68ff 100644
--- a/sqlobject/mysql/__init__.py
+++ b/sqlobject/mysql/__init__.py
@@ -2,7 +2,7 @@ from sqlobject.dbconnection import registerConnection
def builder():
- import mysqlconnection
+ from . import mysqlconnection
return mysqlconnection.MySQLConnection
registerConnection(['mysql'], builder)
diff --git a/sqlobject/postgres/__init__.py b/sqlobject/postgres/__init__.py
index d3d90a1..2b05378 100644
--- a/sqlobject/postgres/__init__.py
+++ b/sqlobject/postgres/__init__.py
@@ -2,7 +2,7 @@ from sqlobject.dbconnection import registerConnection
def builder():
- import pgconnection
+ from . import pgconnection
return pgconnection.PostgresConnection
registerConnection(['postgres', 'postgresql', 'psycopg'], builder)
diff --git a/sqlobject/rdbhost/__init__.py b/sqlobject/rdbhost/__init__.py
index ce86e9f..588c6a8 100644
--- a/sqlobject/rdbhost/__init__.py
+++ b/sqlobject/rdbhost/__init__.py
@@ -2,7 +2,7 @@ from sqlobject.dbconnection import registerConnection
def builder():
- import rdbhostconnection
+ from . import rdbhostconnection
return rdbhostconnection.RdbhostConnection
registerConnection(['rdbhost'], builder)
diff --git a/sqlobject/sqlite/__init__.py b/sqlobject/sqlite/__init__.py
index 7aa679e..54ed963 100644
--- a/sqlobject/sqlite/__init__.py
+++ b/sqlobject/sqlite/__init__.py
@@ -2,7 +2,7 @@ from sqlobject.dbconnection import registerConnection
def builder():
- import sqliteconnection
+ from . import sqliteconnection
return sqliteconnection.SQLiteConnection
registerConnection(['sqlite'], builder)
diff --git a/sqlobject/sybase/__init__.py b/sqlobject/sybase/__init__.py
index 8d2c27e..750cadc 100644
--- a/sqlobject/sybase/__init__.py
+++ b/sqlobject/sybase/__init__.py
@@ -2,7 +2,7 @@ from sqlobject.dbconnection import registerConnection
def builder():
- import sybaseconnection
+ from . import sybaseconnection
return sybaseconnection.SybaseConnection
registerConnection(['sybase'], builder)
http://sourceforge.net/p/sqlobject/sqlobject/ci/6486cbea628913e0a3cef1f3f0f13ba156aeecfd
commit 6486cbea628913e0a3cef1f3f0f13ba156aeecfd
Author: Neil <ne...@di...>
Date: Tue Feb 3 16:37:46 2015 +0200
Use relative import in inheritance
diff --git a/sqlobject/inheritance/__init__.py b/sqlobject/inheritance/__init__.py
index 271fab8..db71622 100644
--- a/sqlobject/inheritance/__init__.py
+++ b/sqlobject/inheritance/__init__.py
@@ -5,7 +5,7 @@ from sqlobject import sqlbuilder
from sqlobject.col import StringCol, ForeignKey
from sqlobject.main import sqlmeta, SQLObject, SelectResults, \
makeProperties, unmakeProperties, getterName, setterName
-import iteration
+from . import iteration
def tablesUsedSet(obj, db):
http://sourceforge.net/p/sqlobject/sqlobject/ci/a697f0f43f159d55ee365f55d1fc2087adec2e95
commit a697f0f43f159d55ee365f55d1fc2087adec2e95
Author: Neil <ne...@di...>
Date: Tue Feb 3 16:37:26 2015 +0200
Use relative import for dbtest imports
diff --git a/sqlobject/tests/test_cache.py b/sqlobject/tests/test_cache.py
index 931ab73..c256da3 100644
--- a/sqlobject/tests/test_cache.py
+++ b/sqlobject/tests/test_cache.py
@@ -1,5 +1,5 @@
from sqlobject import *
-from dbtest import *
+from .dbtest import *
from sqlobject.cache import CacheSet
diff --git a/sqlobject/tests/test_combining_joins.py b/sqlobject/tests/test_combining_joins.py
index 3423ec2..b92c45e 100644
--- a/sqlobject/tests/test_combining_joins.py
+++ b/sqlobject/tests/test_combining_joins.py
@@ -1,5 +1,5 @@
from sqlobject import *
-from dbtest import *
+from .dbtest import *
class ComplexGroup(SQLObject):
diff --git a/sqlobject/tests/test_csvexport.py b/sqlobject/tests/test_csvexport.py
index d491aff..d0f3392 100644
--- a/sqlobject/tests/test_csvexport.py
+++ b/sqlobject/tests/test_csvexport.py
@@ -1,7 +1,7 @@
from __future__ import print_function
from sqlobject import *
-from dbtest import *
+from .dbtest import *
from StringIO import StringIO
from sqlobject.util.csvexport import export_csv, export_csv_zip
diff --git a/sqlobject/tests/test_paste.py b/sqlobject/tests/test_paste.py
index 8c52dee..140e13e 100644
--- a/sqlobject/tests/test_paste.py
+++ b/sqlobject/tests/test_paste.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-from dbtest import *
+from .dbtest import *
from sqlobject import sqlhub, SQLObject, StringCol
import py.test
try:
diff --git a/sqlobject/tests/test_select.py b/sqlobject/tests/test_select.py
index bc920bb..f47d9fe 100644
--- a/sqlobject/tests/test_select.py
+++ b/sqlobject/tests/test_select.py
@@ -2,8 +2,8 @@ import py.test
from sqlobject import *
from sqlobject.sqlbuilder import func
from sqlobject.main import SQLObjectIntegrityError
-from dbtest import *
-from dbtest import setSQLiteConnectionFactory
+from .dbtest import *
+from .dbtest import setSQLiteConnectionFactory
class IterTest(SQLObject):
-----------------------------------------------------------------------
Summary of changes:
sqlobject/firebird/__init__.py | 2 +-
sqlobject/inheritance/__init__.py | 2 +-
sqlobject/maxdb/__init__.py | 2 +-
sqlobject/mssql/__init__.py | 2 +-
sqlobject/mysql/__init__.py | 2 +-
sqlobject/postgres/__init__.py | 2 +-
sqlobject/rdbhost/__init__.py | 2 +-
sqlobject/sqlite/__init__.py | 2 +-
sqlobject/sqlite/sqliteconnection.py | 7 +++++--
sqlobject/sybase/__init__.py | 2 +-
sqlobject/tests/test_cache.py | 2 +-
sqlobject/tests/test_combining_joins.py | 2 +-
sqlobject/tests/test_csvexport.py | 2 +-
sqlobject/tests/test_paste.py | 2 +-
sqlobject/tests/test_select.py | 4 ++--
15 files changed, 20 insertions(+), 17 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
