Rename set_data with __init__

Signed-off-by: Agustin Zubiaga <aguz@sugarlabs.org>

2 files changed, 12 insertions, 16 deletions

diff --git a/activity.py b/activity.py
index 58f70eb..0f907e4 100644
--- a/activity.py
+++ b/activity.py
@@ -490,10 +490,8 @@ class SimpleGraph(activity.Activity):
                                                       "StopWatch")
 
             if boolean:
-                reader = StopWatch()
-
                 f = open(file_path)
-                reader.set_data(f)
+                reader = StopWatch(f)
 
                 stopwatchs_list, count = reader.get_stopwatchs_with_marks()
 
@@ -530,10 +528,8 @@ class SimpleGraph(activity.Activity):
                                                          'Measure')
 
         if boolean:
-            reader = Measure()
             f = open(file_path)
-
-            reader.set_data(f)
+            reader = Measure(f)
 
             self.v_label.entry.set_text(_('Values'))
             self.h_label.entry.set_text(_('Samples'))
diff --git a/readers.py b/readers.py
index 61fe688..f14e686 100644
--- a/readers.py
+++ b/readers.py
@@ -24,26 +24,26 @@ import csv
 
 class StopWatch():
 
-    def set_data(self, data):
-        self.data = cPickle.load(data)
+    def __init__(self, data):
+        self._data = cPickle.load(data)
 
     def get_stopwatchs_with_marks(self):
         count = 0
         stopwatchs_list = []
-        for i in self.data[-1]:
+        for i in self._data[-1]:
             if i:
                 count += 1
-                stopwatchs_list.append([count, self.data[1][count - 1]])
+                stopwatchs_list.append([count, self._data[1][count - 1]])
 
         return stopwatchs_list, count
 
     def get_stopwatch_name(self, num=0):
-        return self.data[1][num]
+        return self._data[1][num]
 
     def marks_to_chart_data(self, num=0, chart_data=[]):
         marks_count = 0
 
-        marks = self.data[-1][num]
+        marks = self._data[-1][num]
         marks.sort()
 
         for i in marks:
@@ -53,7 +53,7 @@ class StopWatch():
         return chart_data
 
     def times_to_chart_data(self):
-        times = [i[0][0] for i in self.data[2]]
+        times = [i[0][0] for i in self._data[2]]
 
         times_count = 0
         chart_data = []
@@ -68,14 +68,14 @@ class StopWatch():
 
 class Measure():
 
-    def set_data(self, data):
-        self.reader = csv.reader(data)
+    def __init__(self, data):
+        self._reader = csv.reader(data)
 
     def get_chart_data(self):
         count = 0
         chart_data = []
 
-        for row in self.reader:
+        for row in self._reader:
             count += 1
 
             if count > 6: