Thread: [SQL-CVS] SQLObject development repository branch master updated. 2.1.0-99-g4b8d897

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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  4b8d897dbcacfa0b12378f18bfff7f1569a9acce (commit)
       via  1eacaf64c580bee845df7b7830aead387724b7cc (commit)
       via  544408ccf13ee0ad8998db9d77f23a8b8b2aa859 (commit)
       via  6ecb84f302397040b0c12e312355d15fb9a243c2 (commit)
       via  a2fe39fda757bbf703c6ac708ccf71281a413dd1 (commit)
       via  dd97f6ac5cfac402ebcbb1285daa2d888721142a (commit)
       via  8895903ae1fedf23cae8e4b284f316003929e2ae (commit)
       via  ad708364ff9bdfd8a7156e02e6bc8ad48289e6a7 (commit)
       via  8fc60f476480c7653477829b3ff535f3272ec278 (commit)
       via  eb239c22801f75e2cee2a138d2ffe36ea8d76b34 (commit)
       via  a680c0e4bd9bb26677db7e89ede3b31366215b1c (commit)
       via  1f1cf53284781ef654021d7423ec54220fa2e48c (commit)
       via  0d2d604bd250982aaffa5e1df845876252af2d53 (commit)
       via  bcd9a5e7e30ed1815061f029c5ab62fefed9d99b (commit)
       via  d821c5d70aaf309b73d6e5de0dc4701c4785e5c0 (commit)
       via  917e212d8fe249bb55e324625ca0e9cef22cbeae (commit)
       via  8811758b7b731b39bc63d0dada3aacece36dd392 (commit)
       via  87937d000351cfd3addb0ac7f1a19de46a35bed5 (commit)
       via  c6c225a54d90533cf2a41f34e6f43a77198e9afd (commit)
      from  4c186a80866582e7bf035cc55e28a5c2fd71b81d (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/4b8d897dbcacfa0b12378f18bfff7f1569a9acce

commit 4b8d897dbcacfa0b12378f18bfff7f1569a9acce
Merge: 1eacaf6 544408c
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Feb 3 23:21:59 2015 +0300

    Merge branch 'flake8-fixes'


http://sourceforge.net/p/sqlobject/sqlobject/ci/1eacaf64c580bee845df7b7830aead387724b7cc

commit 1eacaf64c580bee845df7b7830aead387724b7cc
Merge: 4c186a8 6ecb84f
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Feb 3 23:14:26 2015 +0300

    Merge pull request #58 from drnlm/Fix_relative_imports
    
    Issue #3: Use relative imports


http://sourceforge.net/p/sqlobject/sqlobject/ci/544408ccf13ee0ad8998db9d77f23a8b8b2aa859

commit 544408ccf13ee0ad8998db9d77f23a8b8b2aa859
Merge: 87937d0 8811758
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Feb 3 23:10:40 2015 +0300

    Merge pull request #57 from drnlm/issue_38_E251
    
    Fix #38 - flake8 E251 unexpected spaces
    
    flake8 E251: unexpected spaces around keyword / parameter equals


http://sourceforge.net/p/sqlobject/sqlobject/ci/6ecb84f302397040b0c12e312355d15fb9a243c2

commit 6ecb84f302397040b0c12e312355d15fb9a243c2
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:32:01 2015 +0200

    Don't import new on python 3

diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 5891342..d13db60 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -1,7 +1,11 @@
 import atexit
 from cgi import parse_qsl
 import inspect
-import new
+import sys
+if sys.version_info[0] < 3:
+    # Temporary workaround - will need more attention to fix
+    # usage of new in the code
+    import new
 import os
 import threading
 import types

http://sourceforge.net/p/sqlobject/sqlobject/ci/a2fe39fda757bbf703c6ac708ccf71281a413dd1

commit a2fe39fda757bbf703c6ac708ccf71281a413dd1
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:29:11 2015 +0200

    Avoid dictionary changed crashes on import

diff --git a/sqlobject/col.py b/sqlobject/col.py
index 136b680..68b4643 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -1779,7 +1779,8 @@ def pushKey(kw, name, value):
         kw[name] = value
 
 all = []
-for key, value in globals().items():
+# Use copy() to avoid 'dictionary changed' issues on python 3
+for key, value in globals().copy().items():
     if isinstance(value, type) and (issubclass(value, (Col, SOCol))):
         all.append(key)
 __all__.extend(all)
diff --git a/sqlobject/events.py b/sqlobject/events.py
index aadf5bb..cb4b971 100644
--- a/sqlobject/events.py
+++ b/sqlobject/events.py
@@ -345,6 +345,7 @@ def nice_repr(v):
 
 
 __all__ = ['listen', 'send']
-for name, value in globals().items():
+# Use copy() to avoid 'dictionary changed' issues on python 3
+for name, value in globals().copy().items():
     if isinstance(value, type) and issubclass(value, Signal):
         __all__.append(name)

http://sourceforge.net/p/sqlobject/sqlobject/ci/dd97f6ac5cfac402ebcbb1285daa2d888721142a

commit dd97f6ac5cfac402ebcbb1285daa2d888721142a
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:28:40 2015 +0200

    Add operator.div alias for python 3

diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
index d76e928..60472a3 100644
--- a/sqlobject/sqlbuilder.py
+++ b/sqlobject/sqlbuilder.py
@@ -66,6 +66,7 @@ import re
 import threading
 import types
 import weakref
+import sys
 
 from . import classregistry
 from .converters import registerConverter, sqlrepr, quote_str, unquote_str
@@ -262,9 +263,15 @@ def tablesUsedSet(obj, db):
         return {}
 
 
+if sys.version_info[0] < 3:
+    div = operator.div
+else:
+    div = operator.truediv
+
+
 operatorMap = {
     "+": operator.add,
-    "/": operator.div,
+    "/": div,
     "-": operator.sub,
     "*": operator.mul,
     "<": operator.lt,

http://sourceforge.net/p/sqlobject/sqlobject/ci/8895903ae1fedf23cae8e4b284f316003929e2ae

commit 8895903ae1fedf23cae8e4b284f316003929e2ae
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:27:14 2015 +0200

    Add python3 alias

diff --git a/sqlobject/dberrors.py b/sqlobject/dberrors.py
index c14a86b..986c80d 100644
--- a/sqlobject/dberrors.py
+++ b/sqlobject/dberrors.py
@@ -5,6 +5,9 @@
    http://www.python.org/topics/database/DatabaseAPI-2.0.html
 """
 
+import sys
+if sys.version_info[0] >= 3:
+    StandardError = Exception
 
 class Error(StandardError):
     pass

http://sourceforge.net/p/sqlobject/sqlobject/ci/ad708364ff9bdfd8a7156e02e6bc8ad48289e6a7

commit ad708364ff9bdfd8a7156e02e6bc8ad48289e6a7
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:26:55 2015 +0200

    Alias types and add some python 3 protections

diff --git a/sqlobject/converters.py b/sqlobject/converters.py
index b4c3862..efae0c5 100644
--- a/sqlobject/converters.py
+++ b/sqlobject/converters.py
@@ -2,7 +2,15 @@ from array import array
 import datetime
 from decimal import Decimal
 import time
-from types import ClassType, InstanceType, NoneType
+import sys
+if sys.version_info[0] < 3:
+    from types import ClassType, InstanceType, NoneType
+else:
+    # Use suitable aliases for now
+    ClassType = type
+    NoneType = type(None)
+    # This is may not be what we want in all cases, but will do for now
+    InstanceType = object
 
 
 try:
@@ -80,9 +88,13 @@ def StringLikeConverter(value, db):
     return "'%s'" % value
 
 registerConverter(str, StringLikeConverter)
-registerConverter(unicode, StringLikeConverter)
+if sys.version_info[0] < 3:
+    registerConverter(unicode, StringLikeConverter)
 registerConverter(array, StringLikeConverter)
-registerConverter(buffer, StringLikeConverter)
+if sys.version_info[0] < 3:
+    registerConverter(buffer, StringLikeConverter)
+else:
+    registerConverter(memoryview, StringLikeConverter)
 
 
 def IntConverter(value, db):
@@ -94,7 +106,8 @@ registerConverter(int, IntConverter)
 def LongConverter(value, db):
     return str(value)
 
-registerConverter(long, LongConverter)
+if sys.version_info[0] < 3:
+    registerConverter(long, LongConverter)
 
 if NumericType:
     registerConverter(NumericType, IntConverter)

http://sourceforge.net/p/sqlobject/sqlobject/ci/8fc60f476480c7653477829b3ff535f3272ec278

commit 8fc60f476480c7653477829b3ff535f3272ec278
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:33:34 2015 +0200

    Avoid circular import issues in main.py

diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index c5f121b..5891342 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -13,7 +13,6 @@ from .cache import CacheSet
 from . import classregistry
 from . import col
 from .converters import sqlrepr
-import main
 from . import sqlbuilder
 from .util.threadinglocal import local as threading_local
 
@@ -667,6 +666,7 @@ class DBAPI(DBConnection):
                     self.sqlrepr(secondValue)))
 
     def _SO_columnClause(self, soClass, kw):
+        from . import main
         ops = {None: "IS"}
         data = []
         if 'id' in kw:
diff --git a/sqlobject/sresults.py b/sqlobject/sresults.py
index bbad18a..b740996 100644
--- a/sqlobject/sresults.py
+++ b/sqlobject/sresults.py
@@ -1,5 +1,4 @@
 from . import dbconnection
-import main
 from . import sqlbuilder
 
 
@@ -285,6 +284,7 @@ class SelectResults(object):
         If more than one result is returned,
         ``SQLObjectIntegrityError`` will be raised.
         """
+        from . import main
         results = list(self)
         if not results:
             if default is sqlbuilder.NoDefault:

http://sourceforge.net/p/sqlobject/sqlobject/ci/eb239c22801f75e2cee2a138d2ffe36ea8d76b34

commit eb239c22801f75e2cee2a138d2ffe36ea8d76b34
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:32:37 2015 +0200

    Change to relative imports

diff --git a/sqlobject/sresults.py b/sqlobject/sresults.py
index 71f880d..bbad18a 100644
--- a/sqlobject/sresults.py
+++ b/sqlobject/sresults.py
@@ -1,6 +1,6 @@
-import dbconnection
+from . import dbconnection
 import main
-import sqlbuilder
+from . import sqlbuilder
 
 
 __all__ = ['SelectResults']

http://sourceforge.net/p/sqlobject/sqlobject/ci/a680c0e4bd9bb26677db7e89ede3b31366215b1c

commit a680c0e4bd9bb26677db7e89ede3b31366215b1c
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:30:56 2015 +0200

    Change to relative imports

diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 225cbb2..c5f121b 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -3,20 +3,19 @@ from cgi import parse_qsl
 import inspect
 import new
 import os
-import sys
 import threading
 import types
 import urllib
 import warnings
 import weakref
 
-from cache import CacheSet
-import classregistry
-import col
-from converters import sqlrepr
+from .cache import CacheSet
+from . import classregistry
+from . import col
+from .converters import sqlrepr
 import main
-import sqlbuilder
-from util.threadinglocal import local as threading_local
+from . import sqlbuilder
+from .util.threadinglocal import local as threading_local
 
 warnings.filterwarnings("ignore", "DB-API extension cursor.lastrowid used")
 
@@ -335,7 +334,6 @@ class DBAPI(DBConnection):
 
     ``queryInsertID`` must also be defined.
     """
-
     dbName = None
 
     def __init__(self, **kw):
@@ -1086,11 +1084,11 @@ dbConnectionForScheme = TheURIOpener.dbConnectionForScheme
 
 # Register DB URI schemas -- do import for side effects
 # noqa is a directive for flake8 to ignore seemingly unused imports
-import firebird  # noqa
-import maxdb  # noqa
-import mssql  # noqa
-import mysql  # noqa
-import postgres  # noqa
-import rdbhost  # noqa
-import sqlite  # noqa
-import sybase  # noqa
+from . import firebird  # noqa
+from . import maxdb  # noqa
+from . import mssql  # noqa
+from . import mysql  # noqa
+from . import postgres  # noqa
+from . import rdbhost  # noqa
+from . import sqlite  # noqa
+from . import sybase  # noqa

http://sourceforge.net/p/sqlobject/sqlobject/ci/1f1cf53284781ef654021d7423ec54220fa2e48c

commit 1f1cf53284781ef654021d7423ec54220fa2e48c
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:28:12 2015 +0200

    Change to relative imports

diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
index 583e821..d76e928 100644
--- a/sqlobject/sqlbuilder.py
+++ b/sqlobject/sqlbuilder.py
@@ -67,8 +67,8 @@ import threading
 import types
 import weakref
 
-import classregistry
-from converters import registerConverter, sqlrepr, quote_str, unquote_str
+from . import classregistry
+from .converters import registerConverter, sqlrepr, quote_str, unquote_str
 
 
 class VersionError(Exception):

http://sourceforge.net/p/sqlobject/sqlobject/ci/0d2d604bd250982aaffa5e1df845876252af2d53

commit 0d2d604bd250982aaffa5e1df845876252af2d53
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:26:12 2015 +0200

    Change to relative imports

diff --git a/sqlobject/col.py b/sqlobject/col.py
index 5128eeb..136b680 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -27,12 +27,12 @@ except ImportError:
     import pickle
 import weakref
 from formencode import compound, validators
-from classregistry import findClass
+from .classregistry import findClass
 # Sadly the name "constraints" conflicts with many of the function
 # arguments in this module, so we rename it:
-import constraints as constrs
-import sqlbuilder
-from styles import capword
+from . import constraints as constrs
+from . import sqlbuilder
+from .styles import capword
 
 NoDefault = sqlbuilder.NoDefault
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/bcd9a5e7e30ed1815061f029c5ab62fefed9d99b

commit bcd9a5e7e30ed1815061f029c5ab62fefed9d99b
Author: Neil <ne...@di...>
Date:   Tue Feb 3 14:25:21 2015 +0200

    Change to relative imports

diff --git a/sqlobject/boundattributes.py b/sqlobject/boundattributes.py
index 72d1c5d..9b04b2e 100644
--- a/sqlobject/boundattributes.py
+++ b/sqlobject/boundattributes.py
@@ -26,8 +26,8 @@ attributes.
 __all__ = ['BoundAttribute', 'BoundFactory', 'bind_attributes',
            'bind_attributes_local']
 
-import declarative
-import events
+from . import declarative
+from . import events
 
 
 class BoundAttribute(declarative.Declarative):
diff --git a/sqlobject/declarative.py b/sqlobject/declarative.py
index 04fbe5c..e825cfa 100644
--- a/sqlobject/declarative.py
+++ b/sqlobject/declarative.py
@@ -33,7 +33,7 @@ or an instance method depending on where it is called.
 """
 
 import copy
-import events
+from . import events
 
 import itertools
 counter = itertools.count()
diff --git a/sqlobject/joins.py b/sqlobject/joins.py
index 4da0b97..02280a0 100644
--- a/sqlobject/joins.py
+++ b/sqlobject/joins.py
@@ -1,9 +1,9 @@
 from itertools import count
-import classregistry
-import events
-import styles
-import sqlbuilder
-from styles import capword
+from . import classregistry
+from . import events
+from . import styles
+from . import sqlbuilder
+from .styles import capword
 
 __all__ = ['MultipleJoin', 'SQLMultipleJoin', 'RelatedJoin', 'SQLRelatedJoin',
            'SingleJoin', 'ManyToMany', 'OneToMany']
@@ -373,7 +373,7 @@ class SingleJoin(Join):
 
 
 
-import boundattributes
+from . import boundattributes
 
 
 class SOManyToMany(object):
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 7ad2267..e1ff1fa 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
... 285 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository




Thread: [SQL-CVS] SQLObject development repository branch master updated. 2.1.0-99-g4b8d897

SQLObject is a Python ORM.

sqlobject-cvs