Remove str cast. (#3001)

* Remove str cast. * Revert accidental change. * Fix unit tests. * Remove redundancy. * Bump version. * Bump version to 1.6.6.2 * Update change log. * Fix text.
refinery-platform · Sep 17, 2018 · 04b3c79 · 04b3c79
1 parent 26cd009
commit 04b3c79
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [v1.6.6.2](https://github.com/refinery-platform/refinery-platform/tree/v1.6.6.2) (2018-09-10)
+[Full Changelog](https://github.com/refinery-platform/refinery-platform/compare/v1.6.6.1...v1.6.6.2)
+
+- This hotfix release resolves a bug in the events api caused by a str conversion.
+
 ## [v1.6.6.1](https://github.com/refinery-platform/refinery-platform/tree/v1.6.6.1) (2018-09-10)
 [Full Changelog](https://github.com/refinery-platform/refinery-platform/compare/v1.6.6...v1.6.6.1)
 
@@ -2862,4 +2867,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/refinery/core/models.py b/refinery/core/models.py
@@ -2330,9 +2330,8 @@ def record_data_set_create(data_set):
         )
 
     def render_data_set_create(self):
-        return '{:%x %X}: {} created data set {}'.format(
-            self.date_time, self.user, self.data_set.name
-        )
+        return '{:%x %X}: {} created data set '.format(
+            self.date_time, self.user) + self.data_set.name
 
     # Sub-types for data sets:
     PERMISSIONS_CHANGE = 'PERMISSIONS_CHANGE'

diff --git a/refinery/core/serializers.py b/refinery/core/serializers.py
@@ -147,4 +147,4 @@ class Meta:
 
     @staticmethod
     def get_message(obj):
-        return str(obj)
+        return unicode(obj)
diff --git a/refinery/core/tests.py b/refinery/core/tests.py
@@ -1580,16 +1580,16 @@ class EventTests(TestCase):
     def setUp(self):
         self.user = User.objects.create_user('testuser')
         CuserMiddleware.set_user(self.user)
-        self.pre_re = r'^\d{2}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}: testuser '
-        self.post_re = r' data set Test DataSet - [0-9a-f-]+$'
+        self.pre_re = u'^\d{2}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}: testuser '
+        self.post_re = u' data set Test DataSet - [0-9a-f-]+$'
 
     def test_data_set_create(self):
         create_dataset_with_necessary_models()
         events = Event.objects.all()
         self.assertEqual(len(events), 1)
         self.assertRegexpMatches(
             str(events[0]),
-            self.pre_re + r'created data set Test DataSet - [0-9a-f-]+$'
+            self.pre_re + u'created data set Test DataSet - [0-9a-f-]+$'
         )
 
     # DataSetPermissionsUpdateTests covers data_set_permissions_change.
@@ -1628,13 +1628,13 @@ def test_data_set_analysis_creation(self):
         events = Event.objects.all()
         self.assertEqual(len(events), 2)
         self.assertRegexpMatches(
-            str(events[0]),
-            self.pre_re + r'created' + self.post_re
+            unicode(events[0]),
+            self.pre_re + u'created' + self.post_re
         )
         self.assertRegexpMatches(
-            str(events[1]),
+            unicode(events[1]),
             self.pre_re +
-            r'launched analysis Test WORKFLOW Tool: [0-9a-f-]+ on' +
+            u'launched analysis Test WORKFLOW Tool: [0-9a-f-]+ on' +
             self.post_re
         )
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.6.6.1
+v1.6.6.2