kallithea Changeset - c154dc461bd5

Changeset - c154dc461bd5

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 11 years ago 2015-01-06 00:54:36
madski@unity3d.com

tests: fix some test sqlalchemy unicode warnings

5 files changed with 9 insertions and 9 deletions:

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

0 comments (0 inline, 0 general)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -2275,7 +2275,7 @@ class PullRequest(Base, BaseModel): @@
     @revisions.setter
     def revisions(self, val):
         self._revisions = ':'.join(val)
+        self._revisions = safe_unicode(':'.join(val))
     @property
     def org_ref_parts(self):

kallithea/model/forms.py

➞

Show inline comments

@@ @@ -514,11 +514,11 @@ def GistForm(lifetime_options): @@
         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

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -228,7 +228,7 @@ class Fixture(object): @@
     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,

kallithea/tests/functional/test_admin_gists.py

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ from kallithea.model.db import User, Gis @@
 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 @@ class TestGistsController(TestController @@
         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...

kallithea/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -347,7 +347,7 @@ class TestLoginController(TestController @@
             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 @@ class TestLoginController(TestController @@
             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

0 comments (0 inline, 0 general)