Rename unicode_output to use_unicode

charlatan/file_format.py

@@ -60,7 +60,7 @@ def relationship_constructor(loader, node):
 def configure_output(use_unicode=False):
     """Configure output options of the values loaded by pyyaml
 
-        :param boolean use_unicode: Use unicode constructor for loading strings
+    :param bool use_unicode: Use unicode constructor for loading strings
     """
     if use_unicode:
         yaml.add_constructor(
@@ -69,7 +69,7 @@ def configure_output(use_unicode=False):
         )
 
 
-def load_file(filename, unicode_output=False):
+def load_file(filename, use_unicode=False):
     """Load fixtures definition from file.
 
     :param str filename:
@@ -81,7 +81,7 @@ def load_file(filename, unicode_output=False):
     if filename.endswith(".yaml"):
         # Load the custom YAML tags
         configure_yaml()
-        configure_output(use_unicode=unicode_output)
+        configure_output(use_unicode=use_unicode)
         content = yaml.load(content)
     else:
         raise ValueError("Unsupported filetype: '%s'" % filename)

charlatan/fixtures_manager.py

@@ -47,11 +47,11 @@ class FixturesManager(object):
 
     """
 
-    def __init__(self, db_session=None, unicode_output=False):
+    def __init__(self, db_session=None, use_unicode=False):
         self.hooks = {}
         self.session = db_session
         self.installed_keys = []
-        self.unicode_output = unicode_output
+        self.use_unicode = use_unicode
 
     def load(self, filename, models_package=""):
         """Pre-load the fixtures.
@@ -88,7 +88,7 @@ def _load_fixtures(self, filename):
         :param str filename: file that holds the fixture data
         """
 
-        content = load_file(filename, self.unicode_output)
+        content = load_file(filename, self.use_unicode)
 
         fixtures = {}
         for k, v in _compat.iteritems(content):

charlatan/tests/test_strings.py

@@ -17,7 +17,7 @@ def setUp(self):
         ]
         self.yaml = file_format.load_file(
             './charlatan/tests/data/strings.yaml',
-            unicode_output=True,
+            use_unicode=True,
         )
 
     def tearDown(self):

docs/file-format.rst

@@ -281,6 +281,6 @@ Unicode Strings
 
 .. versionadded:: 0.3.5
 
-In python 2 strings are not, by default, loaded as unicode.  To load all the 
-strings from the yaml files as unicode strings, pass the option 
-`unicode_output` as `True` when you instantiate your fixture manager.
+In python 2 strings are not, by default, loaded as unicode.  To load all the
+strings from the yaml files as unicode strings, pass the option
+`use_unicode` as `True` when you instantiate your fixture manager.