Author: tomaz
Date: Sun Dec 4 22:32:12 2011
New Revision: 1210262
URL: http://svn.apache.org/viewvc?rev=1210262&view=rev
Log:
More Python 3k stuff.
Modified:
libcloud/trunk/libcloud/common/base.py
libcloud/trunk/libcloud/utils/py3.py
libcloud/trunk/test/test_utils.py
libcloud/trunk/tox.ini
Modified: libcloud/trunk/libcloud/common/base.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/common/base.py?rev=1210262&r1=1210261&r2=1210262&view=diff
==============================================================================
--- libcloud/trunk/libcloud/common/base.py (original)
+++ libcloud/trunk/libcloud/common/base.py Sun Dec 4 22:32:12 2011
@@ -33,7 +33,7 @@ from libcloud.utils.py3 import httplib
from libcloud.utils.py3 import urlparse
from libcloud.utils.py3 import urlencode
from libcloud.utils.py3 import StringIO
-from libcloud.utils.py3 import u
+from libcloud.utils.py3 import b
from libcloud.utils.misc import lowercase_keys
from libcloud.common.types import LibcloudError, MalformedResponseError
@@ -60,7 +60,7 @@ class Response(object):
self.body = response.read().strip()
if PY3:
- self.body = self.body.decode('utf-8')
+ self.body = b(self.body).decode('utf-8')
self.status = response.status
Modified: libcloud/trunk/libcloud/utils/py3.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/utils/py3.py?rev=1210262&r1=1210261&r2=1210262&view=diff
==============================================================================
--- libcloud/trunk/libcloud/utils/py3.py (original)
+++ libcloud/trunk/libcloud/utils/py3.py Sun Dec 4 22:32:12 2011
@@ -46,7 +46,7 @@ if sys.version_info >= (3, 0):
bytes = __builtins__['bytes']
def b(s):
if isinstance(s, str):
- return s.encode("ascii")
+ return s.encode('utf-8')
elif isinstance(s, bytes):
return s
else:
Modified: libcloud/trunk/test/test_utils.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/test_utils.py?rev=1210262&r1=1210261&r2=1210262&view=diff
==============================================================================
--- libcloud/trunk/test/test_utils.py (original)
+++ libcloud/trunk/test/test_utils.py Sun Dec 4 22:32:12 2011
@@ -26,8 +26,9 @@ import libcloud.utils.files
from libcloud.utils.misc import get_driver
-from libcloud.utils.py3 import StringIO
from libcloud.utils.py3 import PY3
+from libcloud.utils.py3 import StringIO
+from libcloud.utils.py3 import b
from libcloud.compute.types import Provider
from libcloud.compute.providers import DRIVERS
@@ -102,14 +103,14 @@ class TestUtils(unittest.TestCase):
for x in range(0, 1000):
yield 'aa'
- for result in libcloud.utils.files.read_in_chunks(iterator(),
+ for result in libcloud.utils.files.read_in_chunks(iterator(),
chunk_size=10,
fill_size=False):
- self.assertEqual(result, 'aa')
+ self.assertEqual(result, b('aa'))
for result in libcloud.utils.files.read_in_chunks(iterator(),
chunk_size=10,
fill_size=True):
- self.assertEqual(result, 'aaaaaaaaaa')
+ self.assertEqual(result, b('aaaaaaaaaa'))
def test_read_in_chunks_filelike(self):
class FakeFile(file):
@@ -125,7 +126,7 @@ class TestUtils(unittest.TestCase):
for index, result in enumerate(libcloud.utils.files.read_in_chunks(
FakeFile(), chunk_size=10,
fill_size=False)):
- self.assertEqual(result, 'b' * 11)
+ self.assertEqual(result, b('b' * 11))
self.assertEqual(index, 498)
@@ -133,9 +134,9 @@ class TestUtils(unittest.TestCase):
FakeFile(), chunk_size=10,
fill_size=True)):
if index != 548:
- self.assertEqual(result, 'b' * 10)
+ self.assertEqual(result, b('b' * 10))
else:
- self.assertEqual(result, 'b' * 9)
+ self.assertEqual(result, b('b' * 9))
self.assertEqual(index, 548)
@@ -144,7 +145,7 @@ class TestUtils(unittest.TestCase):
for x in range(0, 1000):
yield 'aa'
- data = 'aa' * 1000
+ data = b('aa' * 1000)
iterator =
libcloud.utils.files.read_in_chunks(iterator=iterator_func())
result = libcloud.utils.files.exhaust_iterator(iterator=iterator)
self.assertEqual(result, data)
@@ -155,13 +156,13 @@ class TestUtils(unittest.TestCase):
data = '12345678990'
iterator = StringIO(data)
result = libcloud.utils.files.exhaust_iterator(iterator=iterator)
- self.assertEqual(result, data)
+ self.assertEqual(result, b(data))
def test_exhaust_iterator_empty_iterator(self):
data = ''
iterator = StringIO(data)
result = libcloud.utils.files.exhaust_iterator(iterator=iterator)
- self.assertEqual(result, data)
+ self.assertEqual(result, b(data))
if __name__ == '__main__':
Modified: libcloud/trunk/tox.ini
URL:
http://svn.apache.org/viewvc/libcloud/trunk/tox.ini?rev=1210262&r1=1210261&r2=1210262&view=diff
==============================================================================
--- libcloud/trunk/tox.ini (original)
+++ libcloud/trunk/tox.ini Sun Dec 4 22:32:12 2011
@@ -1,5 +1,5 @@
[tox]
-envlist = py25,py26,py27,pypy,py3
+envlist = py25,py26,py27,pypy,py32
[testenv]
deps = mock
@@ -10,5 +10,5 @@ deps = mock
ssl
simplejson
-[testenv:py3]
+[testenv:py32]
deps = mock
