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 926024dfa8c83f198432288100dcda18530dd657 (commit)
via 95d589ad2c853b60f1727e5d5fdf9642c6ea6b52 (commit)
from 82df1caa6d872e8df1ce5bf2965f174fe6714a4d (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/926024dfa8c83f198432288100dcda18530dd657
commit 926024dfa8c83f198432288100dcda18530dd657
Merge: 82df1ca 95d589a
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 12 13:05:21 2015 +0300
Merge pull request #78 from drnlm/issue_40_E713
Fix #40: E713 - test for membership should be 'not in'
http://sourceforge.net/p/sqlobject/sqlobject/ci/95d589ad2c853b60f1727e5d5fdf9642c6ea6b52
commit 95d589ad2c853b60f1727e5d5fdf9642c6ea6b52
Author: Neil <drn...@gm...>
Date: Thu Feb 12 11:46:34 2015 +0200
Fix #40: E713 - test for membership should be 'not in'
diff --git a/sqlobject/col.py b/sqlobject/col.py
index 7174fcc..d974f41 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -1780,7 +1780,7 @@ class PickleCol(BLOBCol):
def pushKey(kw, name, value):
- if not name in kw:
+ if name not in kw:
kw[name] = value
all = []
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 6fb6586..4dc9c8f 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -825,7 +825,7 @@ class Transaction(object):
def _SO_delete(self, inst):
cls = inst.__class__.__name__
- if not cls in self._deletedCache:
+ if cls not in self._deletedCache:
self._deletedCache[cls] = []
self._deletedCache[cls].append(inst.id)
if sys.version_info[0] < 3:
@@ -1032,7 +1032,7 @@ class ConnectionURIOpener(object):
def registerConnection(self, schemes, builder):
for uriScheme in schemes:
- assert not uriScheme in self.schemeBuilders \
+ assert uriScheme not in self.schemeBuilders \
or self.schemeBuilders[uriScheme] is builder, \
"A driver has already been registered " \
"for the URI scheme %s" % uriScheme
@@ -1040,7 +1040,7 @@ class ConnectionURIOpener(object):
def registerConnectionInstance(self, inst):
if inst.name:
- assert (not inst.name in self.instanceNames
+ assert (inst.name not in self.instanceNames
or self.instanceNames[inst.name] is cls # noqa
), ("A instance has already been registered "
"with the name %s" % inst.name)
diff --git a/sqlobject/declarative.py b/sqlobject/declarative.py
index d568fc4..33d2db5 100644
--- a/sqlobject/declarative.py
+++ b/sqlobject/declarative.py
@@ -64,7 +64,7 @@ class _methodwrapper(object):
self.type = type
def __call__(self, *args, **kw):
- assert not 'self' in kw and not 'cls' in kw, (
+ assert 'self' not in kw and 'cls' not in kw, (
"You cannot use 'self' or 'cls' arguments to a "
"classinstancemethod")
return self.func(*((self.obj, self.type) + args), **kw)
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 1100769..2e308ea 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -130,7 +130,7 @@ def unmakeProperties(obj):
for var, value in d.items():
if isinstance(value, property):
for prop in [value.fget, value.fset, value.fdel]:
- if prop and not prop.__name__ in d:
+ if prop and prop.__name__ not in d:
delFunc(obj, var)
break
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
index badf41d..f54a587 100755
--- a/sqlobject/manager/command.py
+++ b/sqlobject/manager/command.py
@@ -995,7 +995,7 @@ class CommandRecord(Command):
for fn in os.listdir(last_version_dir):
if not fn.endswith('.sql'):
continue
- if not fn in files_copy:
+ if fn not in files_copy:
if v > 1:
print("Missing file %s" % fn)
break
-----------------------------------------------------------------------
Summary of changes:
sqlobject/col.py | 2 +-
sqlobject/dbconnection.py | 6 +++---
sqlobject/declarative.py | 2 +-
sqlobject/main.py | 2 +-
sqlobject/manager/command.py | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
SQLObject development repository
|