Browse Source

Less useless getters

Matthew Wang 11 years ago
parent
commit
8bea7f19f0
1 changed files with 8 additions and 20 deletions
  1. 8
    20
      cdiff.py

+ 8
- 20
cdiff.py View File

83
         self._new_addr = new_addr   # tuple (start, offset)
83
         self._new_addr = new_addr   # tuple (start, offset)
84
         self._hunk_list = []        # list of tuple (attr, line)
84
         self._hunk_list = []        # list of tuple (attr, line)
85
 
85
 
86
-    def get_hunk_headers(self):
87
-        return self._hunk_headers
88
-
89
-    def get_hunk_meta(self):
90
-        return self._hunk_meta
91
-
92
-    def get_old_addr(self):
93
-        return self._old_addr
94
-
95
-    def get_new_addr(self):
96
-        return self._new_addr
97
-
98
     def append(self, hunk_line):
86
     def append(self, hunk_line):
99
         """hunk_line is a 2-element tuple: (attr, text), where attris : '-':
87
         """hunk_line is a 2-element tuple: (attr, text), where attris : '-':
100
         old, '+': new, ' ': common"""
88
         old, '+': new, ' ': common"""
188
         yield self._markup_new_path(self._new_path)
176
         yield self._markup_new_path(self._new_path)
189
 
177
 
190
         for hunk in self._hunks:
178
         for hunk in self._hunks:
191
-            for hunk_header in hunk.get_hunk_headers():
179
+            for hunk_header in hunk._hunk_headers:
192
                 yield self._markup_hunk_header(hunk_header)
180
                 yield self._markup_hunk_header(hunk_header)
193
-            yield self._markup_hunk_meta(hunk.get_hunk_meta())
181
+            yield self._markup_hunk_meta(hunk._hunk_meta)
194
             for old, new, changed in hunk.mdiff():
182
             for old, new, changed in hunk.mdiff():
195
                 if changed:
183
                 if changed:
196
                     if not old[0]:
184
                     if not old[0]:
275
         if width <= 0:
263
         if width <= 0:
276
             width = 80
264
             width = 80
277
 
265
 
278
-        (start, offset) = self._hunks[-1].get_old_addr()
266
+        (start, offset) = self._hunks[-1]._old_addr
279
         max1 = start + offset - 1
267
         max1 = start + offset - 1
280
-        (start, offset) = self._hunks[-1].get_new_addr()
268
+        (start, offset) = self._hunks[-1]._new_addr
281
         max2 = start + offset - 1
269
         max2 = start + offset - 1
282
         num_width = max(len(str(max1)), len(str(max2)))
270
         num_width = max(len(str(max1)), len(str(max2)))
283
         left_num_fmt = colorize('%%(left_num)%ds' % num_width, 'yellow')
271
         left_num_fmt = colorize('%%(left_num)%ds' % num_width, 'yellow')
293
 
281
 
294
         # yield hunks
282
         # yield hunks
295
         for hunk in self._hunks:
283
         for hunk in self._hunks:
296
-            for hunk_header in hunk.get_hunk_headers():
284
+            for hunk_header in hunk._hunk_headers:
297
                 yield self._markup_hunk_header(hunk_header)
285
                 yield self._markup_hunk_header(hunk_header)
298
-            yield self._markup_hunk_meta(hunk.get_hunk_meta())
286
+            yield self._markup_hunk_meta(hunk._hunk_meta)
299
             for old, new, changed in hunk.mdiff():
287
             for old, new, changed in hunk.mdiff():
300
                 if old[0]:
288
                 if old[0]:
301
-                    left_num = str(hunk.get_old_addr()[0] + int(old[0]) - 1)
289
+                    left_num = str(hunk._old_addr[0] + int(old[0]) - 1)
302
                 else:
290
                 else:
303
                     left_num = ' '
291
                     left_num = ' '
304
 
292
 
305
                 if new[0]:
293
                 if new[0]:
306
-                    right_num = str(hunk.get_new_addr()[0] + int(new[0]) - 1)
294
+                    right_num = str(hunk._new_addr[0] + int(new[0]) - 1)
307
                 else:
295
                 else:
308
                     right_num = ' '
296
                     right_num = ' '
309
 
297