fix bug#777: close issue failed with unicode labels

Matthew · Matthew · commit cb3e635fab96 · 2018-02-01T15:39:14.000+08:00
diff --git a/github3/issues/issue.py b/github3/issues/issue.py
@@ -147,7 +147,11 @@ def close(self):
         """
         assignee = self.assignee.login if self.assignee else ''
         number = self.milestone.number if self.milestone else None
-        labels = [str(l) for l in self.original_labels]
+        try:
+            labels = [str(l) for l in self.original_labels]
+        except UnicodeEncodeError:
+            labels = [l.name for l in self.original_labels]
+
         return self.edit(self.title, self.body, assignee, 'closed',
                          number, labels)
 
diff --git a/tests/unit/test_issues_issue.py b/tests/unit/test_issues_issue.py
@@ -31,7 +31,6 @@
 
 
 class TestIssueRequiresAuth(helper.UnitRequiresAuthenticationHelper):
-
     """Test Issue methods that require Authentication."""
 
     described_class = github3.issues.Issue
@@ -83,7 +82,6 @@ def test_unlock(self):
 
 
 class TestIssue(helper.UnitHelper):
-
     """Test Issue methods that make simple requests."""
 
     described_class = github3.issues.Issue
@@ -120,7 +118,11 @@ def test_assign_empty_username(self):
     def test_close(self):
         """Verify the request for closing an issue."""
         self.instance.close()
-        labels = [str(label) for label in self.instance.original_labels]
+        try:
+            labels = [str(label) for label in self.instance.original_labels]
+        except UnicodeEncodeError:
+            labels = [label.name for label in self.instance.original_labels]
+
         self.patch_called_with(
             url_for(),
             data={
@@ -169,6 +171,21 @@ def test_comment_positive_id(self):
         self.instance.comment(-1)
         assert self.session.get.called is False
 
+    def test_close_with_unicode_labels(self):
+        """Verify the request for closeing an issue."""
+        data = {
+            'title': 'issue title',
+            'body': 'issue body',
+            'assignee': 'sigmavirus24',
+            'state': 'closed',
+            'labels': [u"标签1", u"标签2"]
+        }
+        self.instance.edit(**data)
+        self.patch_called_with(
+            url_for(),
+            data=data
+        )
+
     def test_edit(self):
         """Verify the request for editing an issue."""
         data = {
@@ -323,7 +340,6 @@ def test_replace_labels(self):
 
 
 class TestIssueIterators(helper.UnitIteratorHelper):
-
     """Test Issue methods that return iterators."""
 
     described_class = github3.issues.Issue
@@ -364,7 +380,6 @@ def test_labels(self):
 
 
 class TestLabelRequiresAuth(helper.UnitRequiresAuthenticationHelper):
-
     """Test that ensure certain methods on Label class requires auth."""
 
     described_class = github3.issues.label.Label
@@ -429,7 +444,6 @@ def test_update(self):
 
 
 class TestIssueEvent(helper.UnitHelper):
-
     """Unit test for IssueEvent."""
 
     described_class = github3.issues.event.IssueEvent
