Stop using unicode_literals and fix RelStorage configuration on Pytho…

…n 3. Fixes #8

CHANGES.rst

@@ -1 +1,9 @@
+=========
+ Changes
+=========
 
+1.0.0 (unreleased)
+==================
+
+- Fix relstorage recipe on Python 3. See `issue 8
+  <https://github.com/NextThought/nti.recipes.zodb/issues/8>`_.

src/nti/recipes/zodb/relstorage.py

@@ -4,11 +4,11 @@
 A meta-recipe to create multiple
 relstorage connections in a Dataserver buildout.
 
-.. $Id$
 """
 
-from __future__ import print_function, unicode_literals, absolute_import, division
-__docformat__ = "restructuredtext en"
+from __future__ import print_function
+from __future__ import absolute_import
+from __future__ import division
 
 import textwrap
 
@@ -38,7 +38,7 @@ def __init__(self, buildout, name, options):
         # in an environment is dangerous and can lead to data loss,
         # it's slightly worse to assume shared when its not
         if 'shared-blob-dir' not in options:
-            options['shared-blob-dir'] = b'false' # options must be strings
+            options['shared-blob-dir'] = 'false'
         shared_blob_dir = options['shared-blob-dir']
 
         cache_local_dir = ''
@@ -48,7 +48,7 @@ def __init__(self, buildout, name, options):
             # to the installed.cfg while looking up the storage refs. We
             # avoid taking any user-defined values since it might be
             # confusing to have one (count limited) directory for all storages.
-            cache_local_dir = b'${deployment:cache-directory}/data_cache/${:name}.cache'
+            cache_local_dir = '${deployment:cache-directory}/data_cache/${:name}.cache'
         cache_local_mb = options.get('cache-local-mb', '300')
         cache_local_dir_count = options.get('cache-local-dir-count', '20')
         blob_cache_size = options.get('blob-cache-size', '')

src/nti/recipes/zodb/tests/test_relstorage.py

@@ -63,7 +63,6 @@ def test_parse(self):
                   {'storages': 'Users Users_1 Sessions',
                    'enable-persistent-cache': 'true'})
 
-        buildout.print_options()
         assert_that(buildout['relstorages_users_storage']['client_zcml'],
                     contains_string('shared-blob-dir false'))
 
@@ -106,7 +105,6 @@ def test_parse(self):
                    'cache_servers': 'cache',
                    'enable-persistent-cache': 'true'})
 
-        buildout.print_options()
         assert_that(buildout['relstorages_users_storage']['client_zcml'],
                     contains_string('shared-blob-dir false'))
 
@@ -150,7 +148,6 @@ def test_parse(self):
                    'sql_host': 'host',
                    'enable-persistent-cache': 'true'})
 
-        buildout.print_options()
         assert_that(buildout['relstorages_users_storage']['client_zcml'],
                     is_not(contains_string('cache-servers')))
 
@@ -170,6 +167,5 @@ def test_parse(self):
                   {'storages': 'Users Users_1 Sessions',
                    'enable-persistent-cache': 'true'})
 
-        buildout.print_options()
         assert_that(buildout['relstorages_users_storage']['client_zcml'],
                     is_not(contains_string('cache-servers')))

src/nti/recipes/zodb/zeo.py

@@ -6,9 +6,9 @@
 
 .. $Id$
 """
-
-from __future__ import print_function, unicode_literals, absolute_import, division
-__docformat__ = "restructuredtext en"
+from __future__ import print_function
+from __future__ import absolute_import
+from __future__ import division
 
 logger = __import__('logging').getLogger(__name__)