Fix PR comments

mentoring/questionnaire.py

@@ -77,7 +77,7 @@ class QuestionnaireAbstractBlock(LightChild, StepMixin):
         name = self.__class__.__name__
 
         if str(self.type) not in self.valid_types:
-            raise ValueError('Invalid value for {}.type: `{}`'.format(name, self.type))
+            raise ValueError(u'Invalid value for {}.type: `{}`'.format(name, self.type))
 
         template_path = 'templates/html/{}_{}.html'.format(name.lower(), self.type)
         html = render_js_template(template_path, {

tests/integration/test_assessment.py

@@ -53,10 +53,9 @@ class MentoringAssessmentTest(MentoringBaseTest):
 
         @property
         def state(self):
-            state = {}
-            for choice in self._mcq.find_elements_by_css_selector(".choice"):
-                state[choice.text] = choice.find_element_by_css_selector("input").is_selected()
-            return state
+            return {
+                choice.text: choice.find_element_by_css_selector("input").is_selected()
+                for choice in self._mcq.find_elements_by_css_selector(".choice")}
 
         def select(self, text):
             state = {}