[meld] Specifically request integer division where required

[Kai Willadsen <kaiw src gnome org>]

commit a3f8c7d6c20b98df863bcbb32e10728dae13cc3a
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Oct 27 12:41:11 2012 +1000

    Specifically request integer division where required

 meld/diffutil.py |    6 +++---
 meld/filediff.py |    3 ++-
 meld/linkmap.py  |    2 +-
 meld/matchers.py |    4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/meld/diffutil.py b/meld/diffutil.py
index e3f10b4..20c764d 100644
--- a/meld/diffutil.py
+++ b/meld/diffutil.py
@@ -337,12 +337,12 @@ class Differ(gobject.GObject):
             merge_cache = self._merge_cache
 
         if fromindex == 1:
-            seq = toindex/2
+            seq = toindex // 2
             for c in merge_cache:
                 if c[seq]:
                     yield c[seq]
         else:
-            seq = fromindex/2
+            seq = fromindex // 2
             for c in merge_cache:
                 if c[seq]:
                     yield reverse_chunk(c[seq])
@@ -358,7 +358,7 @@ class Differ(gobject.GObject):
         else:
             merge_cache = self._merge_cache
         if textindex in (0,2):
-            seq = textindex/2
+            seq = textindex // 2
             for cs in merge_cache:
                 if cs[seq]:
                     yield reverse_chunk(cs[seq])
diff --git a/meld/filediff.py b/meld/filediff.py
index c13dbd4..a3ff749 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -703,7 +703,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         fontdesc = pango.FontDescription(self.prefs.get_current_font())
         context = self.textview0.get_pango_context()
         metrics = context.get_metrics( fontdesc, context.get_language() )
-        self.pixels_per_line = (metrics.get_ascent() + metrics.get_descent()) / 1024
+        line_height_points = metrics.get_ascent() + metrics.get_descent()
+        self.pixels_per_line = line_height_points // 1024
         self.pango_char_width = metrics.get_approximate_char_width()
         tabs = pango.TabArray(10, 0)
         tab_size = self.prefs.tab_size
diff --git a/meld/linkmap.py b/meld/linkmap.py
index 779fc16..ed85a64 100644
--- a/meld/linkmap.py
+++ b/meld/linkmap.py
@@ -173,7 +173,7 @@ class LinkMap(gtk.DrawingArea):
         # For bezier control points
         x_steps = [-0.5, (1. / 3) * wtotal, (2. / 3) * wtotal, wtotal + 0.5]
         # Rounded rectangle corner radius for culled changes display
-        radius = self.line_height / 2
+        radius = self.line_height // 2
         q_rad = math.pi / 2
 
         left, right = self.view_indices
diff --git a/meld/matchers.py b/meld/matchers.py
index 6c56256..2dc716e 100644
--- a/meld/matchers.py
+++ b/meld/matchers.py
@@ -31,7 +31,7 @@ def find_common_prefix(a, b):
                 pointermin = pointermid
             else:
                 pointermax = pointermid
-            pointermid = int((pointermax - pointermin) / 2 + pointermin)
+            pointermid = int((pointermax - pointermin) // 2 + pointermin)
         return pointermid
     return 0
 
@@ -48,7 +48,7 @@ def find_common_suffix(a, b):
                 pointermin = pointermid
             else:
                 pointermax = pointermid
-            pointermid = int((pointermax - pointermin) / 2 + pointermin)
+            pointermid = int((pointermax - pointermin) // 2 + pointermin)
         return pointermid
     return 0