diff --git a/attachment_swift/tests/test_with_swift_store.py b/attachment_swift/tests/test_with_swift_store.py index 61c44fd..a4a9202 100644 --- a/attachment_swift/tests/test_with_swift_store.py +++ b/attachment_swift/tests/test_with_swift_store.py @@ -20,7 +20,7 @@ class TestAttachmentSwift(TestIrAttachment): def test_connection(self): """ Test the connection to the Swift object store """ conn = self.Attachment._get_swift_connection() - self.assertNotEquals(conn, False) + self.assertNotEqual(conn, False) def test_store_file_on_swift(self): """ Test writing a file and then reading it """ @@ -28,7 +28,7 @@ class TestAttachmentSwift(TestIrAttachment): set_param('ir_attachment.location', 'swift')) a5 = self.Attachment.create({'name': 'a5', 'datas': self.blob1_b64}) a5bis = self.Attachment.browse(a5.id)[0] - self.assertEquals(a5.datas, a5bis.datas) + self.assertEqual(a5.datas, a5bis.datas) def test_delete_file_on_swift(self): """ Create a file and then test the deletion """ diff --git a/monitoring_statsd/statsd_client.py b/monitoring_statsd/statsd_client.py index c705cb8..2ce7baa 100644 --- a/monitoring_statsd/statsd_client.py +++ b/monitoring_statsd/statsd_client.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import + import logging import os diff --git a/session_redis/session.py b/session_redis/session.py index 8d69b27..c8cab99 100644 --- a/session_redis/session.py +++ b/session_redis/session.py @@ -25,14 +25,14 @@ class RedisSessionStore(SessionStore): self.expiration = DEFAULT_SESSION_TIMEOUT else: self.expiration = expiration - self.prefix = u'session:' + self.prefix = 'session:' if prefix: - self.prefix = u'%s:%s:' % ( + self.prefix = '%s:%s:' % ( self.prefix, prefix ) def build_key(self, sid): - if isinstance(sid, unicode): + if isinstance(sid, str): sid = sid.encode('utf-8') return '%s%s' % (self.prefix, sid)