|
From: Oleg B. <no...@so...> - 2015-02-19 15:39:28
|
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 a680896169d936ed7cd366463ba5548f0ed7c10e (commit)
via 810594917502d17b338dfe6b5c9f43735a4f8e71 (commit)
via e86379aeaa7afddb779b478d23755c373c269347 (commit)
via d7c18e4c7ac414b8b4bd4df68351c45f32f21930 (commit)
via d7f00741e654cb55713c037e1bcd761e979389be (commit)
via 3428200a50dbe2755610be96ed5598563b1b4050 (commit)
via 9150a67d2d3681132feb95d037528e96b0fd9c10 (commit)
via 724ede91ada4bc064a8014630e0fe570eba85e3d (commit)
via d6a56c0e7c4ad322781fa8c2c3fc2e01c81c4afe (commit)
via c4f855b7af9d6d710bd2b25cd95ba60ae07ab5eb (commit)
via 89e4d26a4076c1dfdd6c031fbc43e34e1edb6e61 (commit)
via f86eadf07ba1a8a0234f32e10ba36bcdbb771c2d (commit)
via 52fadfa7901af6a739d7bcd2cadacc9e491d1515 (commit)
via 58e4f5de7a85f6dd1df6ae42b795838db4c9ec0d (commit)
from 1d2c30814029c967ecf0727d87b3c177cbf76375 (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/a680896169d936ed7cd366463ba5548f0ed7c10e
commit a680896169d936ed7cd366463ba5548f0ed7c10e
Merge: 8105949 e86379a
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 19 18:37:29 2015 +0300
Merge pull request #86 from drnlm/add_compatability_types
Add compatability types
diff --cc sqlobject/events.py
index 5442eac,2ab6b75..bf329df
--- a/sqlobject/events.py
+++ b/sqlobject/events.py
@@@ -328,13 -329,13 +329,13 @@@ def nice_repr(v)
"""
Like repr(), but nicer for debugging here.
"""
- if isinstance(v, (types.ClassType, type)):
+ if isinstance(v, class_types):
return v.__module__ + '.' + v.__name__
elif isinstance(v, types.FunctionType):
- if '__name__' in v.func_globals:
- if getattr(sys.modules[v.func_globals['__name__']],
- v.func_name, None) is v:
- return '%s.%s' % (v.func_globals['__name__'], v.func_name)
+ if '__name__' in v.__globals__:
+ if getattr(sys.modules[v.__globals__['__name__']],
+ v.__name__, None) is v:
+ return '%s.%s' % (v.__globals__['__name__'], v.__name__)
return repr(v)
elif isinstance(v, types.MethodType):
return '%s.%s of %s' % (
http://sourceforge.net/p/sqlobject/sqlobject/ci/810594917502d17b338dfe6b5c9f43735a4f8e71
commit 810594917502d17b338dfe6b5c9f43735a4f8e71
Merge: 1d2c308 d6a56c0
Author: Ian Cordasco <sig...@us...>
Date: Thu Feb 19 08:27:12 2015 -0600
Merge pull request #85 from drnlm/py3k_fixes_2
More Minor Py3k fixes
http://sourceforge.net/p/sqlobject/sqlobject/ci/e86379aeaa7afddb779b478d23755c373c269347
commit e86379aeaa7afddb779b478d23755c373c269347
Author: Neil <drn...@gm...>
Date: Thu Feb 19 11:23:59 2015 +0200
Add compability name to avoid buffer related NameErrors
diff --git a/sqlobject/col.py b/sqlobject/col.py
index 3c06ae4..b00f2a3 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -36,7 +36,7 @@ from .classregistry import findClass
from . import constraints as constrs
from . import sqlbuilder
from .styles import capword
-from .compat import string_type, unicode_type
+from .compat import string_type, unicode_type, buffer_type
import datetime
datetime_available = True
@@ -568,7 +568,8 @@ class StringValidator(SOValidator):
if self.dataType and isinstance(value, self.dataType):
return value
if isinstance(value,
- (str, buffer, binaryType, sqlbuilder.SQLExpression)):
+ (str, buffer_type, binaryType,
+ sqlbuilder.SQLExpression)):
return value
if hasattr(value, '__unicode__'):
return unicode(value).encode(dbEncoding)
@@ -1668,7 +1669,7 @@ class BinaryValidator(SOValidator):
if dbName == "sqlite":
value = connection.module.decode(value)
return value
- if isinstance(value, (buffer, binaryType)):
+ if isinstance(value, (buffer_type, binaryType)):
cachedValue = self._cachedValue
if cachedValue and cachedValue[1] == value:
return cachedValue[0]
diff --git a/sqlobject/compat.py b/sqlobject/compat.py
index 8e27aae..e975486 100644
--- a/sqlobject/compat.py
+++ b/sqlobject/compat.py
@@ -21,7 +21,9 @@ if sys.version_info[0] < 3:
string_type = basestring
unicode_type = unicode
class_types = (type, types.ClassType)
+ buffer_type = buffer
else:
string_type = str
unicode_type = str
class_types = (type, )
+ buffer_type = memoryview
diff --git a/sqlobject/converters.py b/sqlobject/converters.py
index 87879f2..8757e40 100644
--- a/sqlobject/converters.py
+++ b/sqlobject/converters.py
@@ -3,6 +3,7 @@ import datetime
from decimal import Decimal
import time
import sys
+from .compat import buffer_type
if sys.version_info[0] < 3:
from types import ClassType, InstanceType, NoneType
else:
@@ -79,7 +80,7 @@ def StringLikeConverter(value, db):
value = value.tounicode()
except ValueError:
value = value.tostring()
- elif isinstance(value, buffer):
+ elif isinstance(value, buffer_type):
value = str(value)
if db in ('mysql', 'postgres', 'rdbhost'):
@@ -98,7 +99,7 @@ if sys.version_info[0] < 3:
registerConverter(unicode, StringLikeConverter)
registerConverter(array, StringLikeConverter)
if sys.version_info[0] < 3:
- registerConverter(buffer, StringLikeConverter)
+ registerConverter(buffer_type, StringLikeConverter)
else:
registerConverter(memoryview, StringLikeConverter)
http://sourceforge.net/p/sqlobject/sqlobject/ci/d7c18e4c7ac414b8b4bd4df68351c45f32f21930
commit d7c18e4c7ac414b8b4bd4df68351c45f32f21930
Author: Neil <drn...@gm...>
Date: Wed Feb 18 10:59:43 2015 +0200
Add compatability type for isinstance(x, unicode) checks
diff --git a/sqlobject/col.py b/sqlobject/col.py
index a86283a..3c06ae4 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -36,7 +36,7 @@ from .classregistry import findClass
from . import constraints as constrs
from . import sqlbuilder
from .styles import capword
-from .compat import string_type
+from .compat import string_type, unicode_type
import datetime
datetime_available = True
@@ -563,7 +563,7 @@ class StringValidator(SOValidator):
except AttributeError:
binaryType = type(None) # Just a simple workaround
dbEncoding = self.getDbEncoding(state, default='ascii')
- if isinstance(value, unicode):
+ if isinstance(value, unicode_type):
return value.encode(dbEncoding)
if self.dataType and isinstance(value, self.dataType):
return value
@@ -592,7 +592,7 @@ class StringCol(Col):
class NQuoted(sqlbuilder.SQLExpression):
def __init__(self, value):
- assert isinstance(value, unicode)
+ assert isinstance(value, unicode_type)
self.value = value
def __hash__(self):
@@ -608,7 +608,7 @@ class UnicodeStringValidator(SOValidator):
def to_python(self, value, state):
if value is None:
return None
- if isinstance(value, (unicode, sqlbuilder.SQLExpression)):
+ if isinstance(value, (unicode_type, sqlbuilder.SQLExpression)):
return value
if isinstance(value, str):
return unicode(value, self.getDbEncoding(state))
@@ -626,7 +626,7 @@ class UnicodeStringValidator(SOValidator):
return None
if isinstance(value, (str, sqlbuilder.SQLExpression)):
return value
- if isinstance(value, unicode):
+ if isinstance(value, unicode_type):
try:
connection = state.connection or state.soObject._connection
except AttributeError:
@@ -1029,7 +1029,7 @@ class EnumValidator(SOValidator):
def to_python(self, value, state):
if value in self.enumValues:
- if isinstance(value, unicode):
+ if isinstance(value, unicode_type):
dbEncoding = self.getDbEncoding(state)
value = value.encode(dbEncoding)
return value
@@ -1738,7 +1738,7 @@ class PickleValidator(BinaryValidator):
def to_python(self, value, state):
if value is None:
return None
- if isinstance(value, unicode):
+ if isinstance(value, unicode_type):
dbEncoding = self.getDbEncoding(state, default='ascii')
value = value.encode(dbEncoding)
if isinstance(value, str):
diff --git a/sqlobject/compat.py b/sqlobject/compat.py
index aa0288a..8e27aae 100644
--- a/sqlobject/compat.py
+++ b/sqlobject/compat.py
@@ -19,7 +19,9 @@ def with_metaclass(meta, *bases):
# Compatability definitions (inspired by six)
if sys.version_info[0] < 3:
string_type = basestring
+ unicode_type = unicode
class_types = (type, types.ClassType)
else:
string_type = str
+ unicode_type = str
class_types = (type, )
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 956ebc7..fdb6d9e 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -19,7 +19,7 @@ from . import col
from .converters import sqlrepr
from . import sqlbuilder
from .util.threadinglocal import local as threading_local
-from .compat import string_type
+from .compat import string_type, unicode_type
warnings.filterwarnings("ignore", "DB-API extension cursor.lastrowid used")
@@ -40,7 +40,7 @@ class ConsoleWriter:
def write(self, text):
logfile = getattr(sys, self.loglevel)
- if isinstance(text, unicode):
+ if isinstance(text, unicode_type):
try:
text = text.encode(self.dbEncoding)
except UnicodeEncodeError:
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 5edac41..5c26756 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -41,7 +41,7 @@ from . import declarative
from . import events
from .sresults import SelectResults
from .util.threadinglocal import local
-from sqlobject.compat import with_metaclass, string_type
+from sqlobject.compat import with_metaclass, string_type, unicode_type
if ((sys.version_info[0] == 2) and (sys.version_info[:3] < (2, 6, 0))) or \
((sys.version_info[0] == 3) and (sys.version_info[:3] < (3, 4, 0))):
@@ -50,7 +50,6 @@ if ((sys.version_info[0] == 2) and (sys.version_info[:3] < (2, 6, 0))) or \
if sys.version_info[0] > 2:
# alias for python 3 compatability
long = int
- unicode = str
"""
This thread-local storage is needed for RowCreatedSignals. It gathers
@@ -476,7 +475,7 @@ class sqlmeta(with_metaclass(declarative.DeclarativeMeta, object)):
conn = connection or soClass._connection
for columnDef in conn.columnsFromSchema(sqlmeta.table, soClass):
if columnDef.name not in sqlmeta.columnDefinitions:
- if isinstance(columnDef.name, unicode):
+ if isinstance(columnDef.name, unicode_type):
columnDef.name = columnDef.name.encode('ascii')
sqlmeta.addColumn(columnDef)
http://sourceforge.net/p/sqlobject/sqlobject/ci/d7f00741e654cb55713c037e1bcd761e979389be
commit d7f00741e654cb55713c037e1bcd761e979389be
Author: Neil <drn...@gm...>
Date: Wed Feb 18 10:56:52 2015 +0200
standardise isinstance test
diff --git a/sqlobject/main.py b/sqlobject/main.py
index ecae515..5edac41 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -41,7 +41,7 @@ from . import declarative
from . import events
from .sresults import SelectResults
from .util.threadinglocal import local
-from sqlobject.compat import with_metaclass
+from sqlobject.compat import with_metaclass, string_type
if ((sys.version_info[0] == 2) and (sys.version_info[:3] < (2, 6, 0))) or \
((sys.version_info[0] == 3) and (sys.version_info[:3] < (3, 4, 0))):
@@ -1737,7 +1737,7 @@ class SQLObject(with_metaclass(declarative.DeclarativeMeta, object)):
@classmethod
def setConnection(cls, value):
- if isinstance(value, (str, unicode)):
+ if isinstance(value, string_type):
value = dbconnection.connectionForURI(value)
cls._connection = value
http://sourceforge.net/p/sqlobject/sqlobject/ci/3428200a50dbe2755610be96ed5598563b1b4050
commit 3428200a50dbe2755610be96ed5598563b1b4050
Author: Neil <drn...@gm...>
Date: Wed Feb 18 10:54:48 2015 +0200
replace basestring
diff --git a/sqlobject/col.py b/sqlobject/col.py
index 8cbf04b..a86283a 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -36,6 +36,7 @@ from .classregistry import findClass
from . import constraints as constrs
from . import sqlbuilder
from .styles import capword
+from .compat import string_type
import datetime
datetime_available = True
@@ -1121,7 +1122,7 @@ class SetValidator(SOValidator):
self.name, type(value), value), value, state)
def from_python(self, value, state):
- if isinstance(value, basestring):
+ if isinstance(value, string_type):
value = (value,)
try:
return ",".join(value)
@@ -1532,7 +1533,7 @@ class DecimalValidator(SOValidator):
return None
if isinstance(value, float):
value = str(value)
- if isinstance(value, basestring):
+ if isinstance(value, string_type):
try:
connection = state.connection or state.soObject._connection
except AttributeError:
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 57ca294..956ebc7 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -19,6 +19,7 @@ from . import col
from .converters import sqlrepr
from . import sqlbuilder
from .util.threadinglocal import local as threading_local
+from .compat import string_type
warnings.filterwarnings("ignore", "DB-API extension cursor.lastrowid used")
@@ -618,7 +619,7 @@ class DBAPI(DBConnection):
def _SO_selectOneAlt(self, so, columnNames, condition):
if columnNames:
- columns = [isinstance(x, basestring) and
+ columns = [isinstance(x, string_type) and
sqlbuilder.SQLConstant(x) or
x for x in columnNames]
else:
diff --git a/sqlobject/include/hashcol.py b/sqlobject/include/hashcol.py
index 81e5c7a..18aeddf 100644
--- a/sqlobject/include/hashcol.py
+++ b/sqlobject/include/hashcol.py
@@ -1,4 +1,5 @@
import sqlobject.col
+from sqlobject.compat import string_type
__all__ = ['HashCol']
@@ -17,7 +18,7 @@ class DbHash:
if self.hash is None:
return 0
return True
- if not isinstance(other, basestring):
+ if not isinstance(other, string_type):
raise TypeError(
"A hash may only be compared with a string, or None.")
return cmp(self.hashMethod(other), self.hash)
diff --git a/sqlobject/inheritance/__init__.py b/sqlobject/inheritance/__init__.py
index 5795458..a1340d4 100644
--- a/sqlobject/inheritance/__init__.py
+++ b/sqlobject/inheritance/__init__.py
@@ -7,6 +7,7 @@ from sqlobject import sqlbuilder
from sqlobject.col import StringCol, ForeignKey
from sqlobject.main import sqlmeta, SQLObject, SelectResults, \
makeProperties, unmakeProperties, getterName, setterName
+from sqlobject.compat import string_type
from . import iteration
@@ -39,7 +40,7 @@ class InheritableSelectResults(SelectResults):
if inheritedTables:
for tableName in inheritedTables:
tablesSet.add(str(tableName))
- if orderBy and not isinstance(orderBy, basestring):
+ if orderBy and not isinstance(orderBy, string_type):
tablesSet.update(tablesUsedSet(orderBy, dbName))
# DSM: if this class has a parent, we need to link it
# DSM: and be sure the parent is in the table list.
@@ -91,7 +92,7 @@ class InheritableSelectResults(SelectResults):
accumulateMany(*attributes)
tables = []
for func_name, attribute in attributes:
- if not isinstance(attribute, basestring):
+ if not isinstance(attribute, string_type):
tables.append(attribute.tableName)
clone = self.__class__(self.sourceClass, self.clause,
self.clauseTables, inheritedTables=tables,
@@ -456,7 +457,7 @@ class InheritableSQLObject(SQLObject):
# if the clause was one of TRUE varians, replace it
if (clause is None) or (clause is sqlbuilder.SQLTrueClause) \
or (
- isinstance(clause, basestring) and
+ isinstance(clause, string_type) and
(clause == 'all')):
clause = addClause
else:
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
index 2649985..7b8a9de 100755
--- a/sqlobject/manager/command.py
+++ b/sqlobject/manager/command.py
@@ -20,7 +20,7 @@ from sqlobject import col
from sqlobject.classregistry import findClass
from sqlobject.declarative import DeclarativeMeta
from sqlobject.util import moduleloader
-from sqlobject.compat import with_metaclass
+from sqlobject.compat import with_metaclass, string_type
# It's not very unsafe to use tempnam like we are doing:
warnings.filterwarnings(
@@ -1285,7 +1285,7 @@ class CommandUpgrade(CommandRecord):
def update_sys_path(paths, verbose):
- if isinstance(paths, basestring):
+ if isinstance(paths, string_type):
paths = [paths]
for path in paths:
path = os.path.abspath(path)
diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
index de028e0..efdcfc2 100644
--- a/sqlobject/sqlbuilder.py
+++ b/sqlobject/sqlbuilder.py
@@ -70,6 +70,7 @@ import sys
from . import classregistry
from .converters import registerConverter, sqlrepr, quote_str, unquote_str
+from .compat import string_type
class VersionError(Exception):
@@ -91,7 +92,7 @@ safeSQLRE = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_\.]*$')
def sqlIdentifier(obj):
# some db drivers return unicode column names
- return isinstance(obj, basestring) and bool(safeSQLRE.search(obj.strip()))
+ return isinstance(obj, string_type) and bool(safeSQLRE.search(obj.strip()))
def execute(expr, executor):
@@ -102,7 +103,7 @@ def execute(expr, executor):
def _str_or_sqlrepr(expr, db):
- if isinstance(expr, basestring):
+ if isinstance(expr, string_type):
return expr
return sqlrepr(expr, db)
@@ -721,7 +722,7 @@ class Select(SQLExpression):
# None doesn't filter anything, it's just a no-op:
return self
clause = self.ops['clause']
- if isinstance(clause, basestring):
... 463 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
