[#1841] extras_unicode_convert is not a validator

ckan · Aug 7, 2014 · 3770777 · 3770777
1 parent 683c7ff
commit 3770777
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ckan/logic/converters.py b/ckan/logic/converters.py
@@ -34,6 +34,11 @@ def remove_from_extras(data, key):
         return
     remove_from_extras(data, data_key[1])
 
+def extras_unicode_convert(extras, context):
+    for extra in extras:
+        extras[extra] = unicode(extras[extra])
+    return extras
+
 def date_to_db(value, context):
     try:
         value = field_types.DateType.form_to_db(value)

diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
@@ -10,7 +10,6 @@
 from ckan.logic.validators import (package_id_not_changed,
                                    package_id_exists,
                                    package_id_or_name_exists,
-                                   extras_unicode_convert,
                                    name_validator,
                                    package_name_validator,
                                    package_version_validator,
@@ -60,6 +59,7 @@
                                    convert_group_name_or_id_to_id,
                                    convert_to_json_if_string,
                                    remove_whitespace,
+                                   extras_unicode_convert,
                                    )
 from formencode.validators import OneOf
 import ckan.model

diff --git a/ckan/logic/validators.py b/ckan/logic/validators.py
@@ -307,11 +307,6 @@ def object_id_validator(key, activity_dict, errors, context):
         raise Invalid('There is no object_id validator for '
             'activity type "%s"' % activity_type)
 
-def extras_unicode_convert(extras, context):
-    for extra in extras:
-        extras[extra] = unicode(extras[extra])
-    return extras
-
 name_match = re.compile('[a-z0-9_\-]*$')
 def name_validator(value, context):
     '''Return the given value if it's a valid name, otherwise raise Invalid.