Mercurial > kallithea

changeset 4731:c154dc461bd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix some test sqlalchemy unicode warnings
author Mads Kiilerich <madski@unity3d.com>
date Tue, 06 Jan 2015 00:54:36 +0100
parents 52bf718b30f5
children 0f96804480c3
files kallithea/model/db.py kallithea/model/forms.py kallithea/tests/fixture.py kallithea/tests/functional/test_admin_gists.py kallithea/tests/functional/test_login.py
diffstat 5 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/model/db.py	Tue Jan 06 00:54:36 2015 +0100
+++ b/kallithea/model/db.py	Tue Jan 06 00:54:36 2015 +0100
@@ -2275,7 +2275,7 @@
 
     @revisions.setter
     def revisions(self, val):
-        self._revisions = ':'.join(val)
+        self._revisions = safe_unicode(':'.join(val))
 
     @property
     def org_ref_parts(self):
--- a/kallithea/model/forms.py	Tue Jan 06 00:54:36 2015 +0100
+++ b/kallithea/model/forms.py	Tue Jan 06 00:54:36 2015 +0100
@@ -514,11 +514,11 @@
 
         filename = All(v.BasePath()(),
                        v.UnicodeString(strip=True, required=False))
-        description = v.UnicodeString(required=False, if_missing='')
+        description = v.UnicodeString(required=False, if_missing=u'')
         lifetime = v.OneOf(lifetime_options)
         mimetype = v.UnicodeString(required=False, if_missing=None)
         content = v.UnicodeString(required=True, not_empty=True)
-        public = v.UnicodeString(required=False, if_missing='')
-        private = v.UnicodeString(required=False, if_missing='')
+        public = v.UnicodeString(required=False, if_missing=u'')
+        private = v.UnicodeString(required=False, if_missing=u'')
 
     return _GistForm
--- a/kallithea/tests/fixture.py	Tue Jan 06 00:54:36 2015 +0100
+++ b/kallithea/tests/fixture.py	Tue Jan 06 00:54:36 2015 +0100
@@ -228,7 +228,7 @@
 
     def create_gist(self, **kwargs):
         form_data = {
-            'description': 'new-gist',
+            'description': u'new-gist',
             'owner': TEST_USER_ADMIN_LOGIN,
             'gist_type': GistModel.cls.GIST_PUBLIC,
             'lifetime': -1,
--- a/kallithea/tests/functional/test_admin_gists.py	Tue Jan 06 00:54:36 2015 +0100
+++ b/kallithea/tests/functional/test_admin_gists.py	Tue Jan 06 00:54:36 2015 +0100
@@ -5,7 +5,7 @@
 
 
 def _create_gist(f_name, content='some gist', lifetime=-1,
-                 description='gist-desc', gist_type='public',
+                 description=u'gist-desc', gist_type='public',
                  owner=TEST_USER_ADMIN_LOGIN):
     gist_mapping = {
         f_name: {'content': content}
@@ -33,7 +33,7 @@
 
         g1 = _create_gist('gist1').gist_access_id
         g2 = _create_gist('gist2', lifetime=1400).gist_access_id
-        g3 = _create_gist('gist3', description='gist3-desc').gist_access_id
+        g3 = _create_gist('gist3', description=u'gist3-desc').gist_access_id
         g4 = _create_gist('gist4', gist_type='private').gist_access_id
         response = self.app.get(url('gists'))
         # Test response...
--- a/kallithea/tests/functional/test_login.py	Tue Jan 06 00:54:36 2015 +0100
+++ b/kallithea/tests/functional/test_login.py	Tue Jan 06 00:54:36 2015 +0100
@@ -347,7 +347,7 @@
             self.assertEqual(['ChangesetController:changeset_raw'],
                              whitelist['api_access_controllers_whitelist'])
 
-            new_api_key = ApiKeyModel().create(TEST_USER_ADMIN_LOGIN, 'test')
+            new_api_key = ApiKeyModel().create(TEST_USER_ADMIN_LOGIN, u'test')
             Session().commit()
             with fixture.anon_access(False):
                 self.app.get(url(controller='changeset',
@@ -361,7 +361,7 @@
             self.assertEqual(['ChangesetController:changeset_raw'],
                              whitelist['api_access_controllers_whitelist'])
 
-            new_api_key = ApiKeyModel().create(TEST_USER_ADMIN_LOGIN, 'test')
+            new_api_key = ApiKeyModel().create(TEST_USER_ADMIN_LOGIN, u'test')
             Session().commit()
             #patch the api key and make it expired
             new_api_key.expires = 0