From 8e6077e270fc5be3e8d6da8ea9980e6471c1b271 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Fri, 25 Apr 2014 14:56:30 +0200
Subject: [PATCH] Fix pep8 errors

The recent pep8 upgrade is triggering new errors.

Change-Id: I73b1de3afed0a6979e0542e4c90cdb0bdb8b1122
---
 wsme/rest/json.py           | 2 --
 wsme/tests/test_restjson.py | 8 --------
 wsmeext/soap/protocol.py    | 1 -
 wsmeext/sqlalchemy/types.py | 4 ++--
 wsmeext/tests/test_soap.py  | 7 +------
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/wsme/rest/json.py b/wsme/rest/json.py
index 9adfd6b..8f6aca8 100644
--- a/wsme/rest/json.py
+++ b/wsme/rest/json.py
@@ -262,8 +262,6 @@ def encode_sample_params(params, format=False):
 
 def encode_sample_result(datatype, value, format=False):
     r = tojson(datatype, value)
-    #if self.nest_result:
-        #r = {'result': r}
     content = json.dumps(r, ensure_ascii=False, indent=4 if format else 0,
                          sort_keys=format)
     return ('javascript', content)
diff --git a/wsme/tests/test_restjson.py b/wsme/tests/test_restjson.py
index dfbdf74..573661e 100644
--- a/wsme/tests/test_restjson.py
+++ b/wsme/tests/test_restjson.py
@@ -330,14 +330,6 @@ class TestRestJson(wsme.tests.protocol.RestOnlyProtocolTestCase):
         )
         assert r[0] == 'javascript', r[0]
         assert r[1] == '''2'''
-        #self.root.protocols[0].nest_result = True
-        #r = wsme.rest.json.encode_sample_result(
-            #int, 2, True
-        #)
-        #assert r[0] == 'javascript', r[0]
-        #assert r[1] == '''{
-    #"result": 2
-#}'''
 
     def test_PUT(self):
         data = {"id": 1, "name": u("test")}
diff --git a/wsmeext/soap/protocol.py b/wsmeext/soap/protocol.py
index 6181088..f40cac1 100644
--- a/wsmeext/soap/protocol.py
+++ b/wsmeext/soap/protocol.py
@@ -56,7 +56,6 @@ type_registry = {
     int: 'xs:int',
     float: "xs:float",
     bool: "xs:boolean",
-    #unsigned: "xs:unsignedInt",
     datetime.datetime: "xs:dateTime",
     datetime.date: "xs:date",
     datetime.time: "xs:time",
diff --git a/wsmeext/sqlalchemy/types.py b/wsmeext/sqlalchemy/types.py
index da5603d..414bf52 100644
--- a/wsmeext/sqlalchemy/types.py
+++ b/wsmeext/sqlalchemy/types.py
@@ -125,9 +125,9 @@ class Base(six.with_metaclass(BaseMeta, wsme.types.Base)):
         for attr in self._wsme_attributes:
             if not isinstance(attr, wsattr):
                 continue
-            if attrs and not attr.isrelation and not attr.name in attrs:
+            if attrs and not attr.isrelation and attr.name not in attrs:
                 continue
-            if attr.isrelation and not attr.name in eagerload:
+            if attr.isrelation and attr.name not in eagerload:
                 continue
             value = getattr(instance, attr.saname)
             if attr.isrelation:
diff --git a/wsmeext/tests/test_soap.py b/wsmeext/tests/test_soap.py
index 73a2cb9..3e070a7 100644
--- a/wsmeext/tests/test_soap.py
+++ b/wsmeext/tests/test_soap.py
@@ -258,7 +258,7 @@ def fromsuds(dt, value):
         return [fromsuds(dt[0], item) for item in value.item]
     if wsme.types.isarray(dt):
         return [fromsuds(dt.item_type, item) for item in value.item]
-    if wsme.types.isusertype(dt) and not dt in fromsuds_types:
+    if wsme.types.isusertype(dt) and dt not in fromsuds_types:
         dt = dt.basetype
     if dt in fromsuds_types:
         print(dt, value)
@@ -390,12 +390,7 @@ class TestSOAP(wsme.tests.protocol.ProtocolTestCase):
         return self._sudsclient
 
     def test_wsdl(self):
-        #assert res.body.find('NestedOuter_Array') != -1
-        #assert 'returntypesGettext' in res.body
-        #assert 'returntypesGettextResponse' in res.body
-#
         c = self.sudsclient
-        print(c)
         assert c.wsdl.tns[1] == tns, c.wsdl.tns
 
         sd = c.sd[0]