Quick patch to regression causing partial credit to break on 6.00x

common/lib/capa/capa/correctmap.py

@@ -115,11 +115,13 @@ class CorrectMap(object):
             If the answer is correct, return the assigned
             number of points (default: 1 point)
             Otherwise, return 0 points """
-        if self.is_correct(answer_id):
-            npoints = self.get_property(answer_id, 'npoints')
-            return npoints if npoints is not None else 1
-        else:
-            return 0
+        npoints = self.get_property(answer_id, 'npoints')
+        if npoints is not None:
+            return npoints
+        elif self.is_correct(answer_id):
+            return 1
+         # if not correct and no points have been assigned, return 0
+        return 0
 
     def set_property(self, answer_id, property, value):
         if answer_id in self.cmap: