[SQL-CVS] SQLObject development repository branch master updated. 2.1.0-137-g57d0234

[Oleg B. <no...@so...>]

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  57d02341d725820da1574fbdcc58c5b173cbf3c9 (commit)
       via  85d3f0a07baf0885d41ce6cc00e414f1b5cb5f9b (commit)
      from  bb333927311676fc023ec54938be81a2ee7e0d03 (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/57d02341d725820da1574fbdcc58c5b173cbf3c9

commit 57d02341d725820da1574fbdcc58c5b173cbf3c9
Merge: bb33392 85d3f0a
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Feb 6 23:44:28 2015 +0300

    Merge pull request #66 from drnlm/issue_48_flak8_E121
    
    Issue 48: Fix E121 - continuation line under-indented for hanging indent


http://sourceforge.net/p/sqlobject/sqlobject/ci/85d3f0a07baf0885d41ce6cc00e414f1b5cb5f9b

commit 85d3f0a07baf0885d41ce6cc00e414f1b5cb5f9b
Author: Neil <ne...@di...>
Date:   Fri Feb 6 22:06:50 2015 +0200

    Fix E121 - continuation line under-indented for hanging indent

diff --git a/sqlobject/inheritance/__init__.py b/sqlobject/inheritance/__init__.py
index b570310..32b609e 100644
--- a/sqlobject/inheritance/__init__.py
+++ b/sqlobject/inheritance/__init__.py
@@ -4,7 +4,7 @@ from sqlobject import events
 from sqlobject import sqlbuilder
 from sqlobject.col import StringCol, ForeignKey
 from sqlobject.main import sqlmeta, SQLObject, SelectResults, \
-   makeProperties, unmakeProperties, getterName, setterName
+    makeProperties, unmakeProperties, getterName, setterName
 from . import iteration
 
 
diff --git a/sqlobject/sresults.py b/sqlobject/sresults.py
index b740996..924c7e5 100644
--- a/sqlobject/sresults.py
+++ b/sqlobject/sresults.py
@@ -29,7 +29,7 @@ class SelectResults(object):
             del ops['connection']
         if ops.get('limit', None):
             assert not ops.get('start', None) and not ops.get('end', None), \
-               "'limit' cannot be used with 'start' or 'end'"
+                "'limit' cannot be used with 'start' or 'end'"
             ops["start"] = 0
             ops["end"] = ops.pop("limit")
 

-----------------------------------------------------------------------

Summary of changes:
 sqlobject/inheritance/__init__.py |    2 +-
 sqlobject/sresults.py             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository