merge master, fix conflicts

orcasgit · Dec 18, 2014 · 5795a72 · 5795a72
2 parents 6b2f600 + 285db38
commit 5795a72
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 dist
 django_misfit.egg-info
 .coverage
+env
diff --git a/misfitapp/models.py b/misfitapp/models.py
@@ -114,7 +114,7 @@ class Sleep(models.Model):
     duration = models.IntegerField()
 
     def __str__(self):
-        '%s %s' % (start_time, duration)
+        return '%s %s' % (self.start_time, self.duration)
 
 
 @python_2_unicode_compatible
@@ -129,7 +129,7 @@ class SleepSegment(models.Model):
     sleep_type = models.SmallIntegerField(choices=SLEEP_TYPES)
 
     def __str__(self):
-        '%s %s' % (time, sleep_type)
+        return '%s %s' % (self.time, self.sleep_type)
 
     class Meta:
         unique_together = ('sleep', 'time')
diff --git a/misfitapp/tests/test_models.py b/misfitapp/tests/test_models.py
@@ -101,10 +101,13 @@ def test_sleep(self):
         }
         sleep = Sleep(**data)
         sleep.save()
+        self.assertEqual(
+            '%s' % sleep, '%s %s' % (sleep.start_time, sleep.duration))
 
         seg_data = {'sleep': sleep,
                     'time': data['start_time'],
                     'sleep_type': SleepSegment.SLEEP,
         }
         seg = SleepSegment(**seg_data)
         seg.save()
+        self.assertEqual('%s' % seg, '%s %s' % (seg.time, seg.sleep_type))