[meld] wraplabel: code quality fixes

[Kai Willadsen <kaiw src gnome org>]

commit 1a3d1b484a824b5b3dd5985df88c932a3ffdb384
Author: Sandro Bonazzola <sandro bonazzola gmail com>
Date:   Sun Jul 28 08:37:07 2013 +0200

    wraplabel: code quality fixes
    
    - removed unused imports
    - pep8 cleanup
    - avoid redefining builtin str

 meld/ui/wraplabel.py |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/meld/ui/wraplabel.py b/meld/ui/wraplabel.py
index d40a5be..52b850e 100644
--- a/meld/ui/wraplabel.py
+++ b/meld/ui/wraplabel.py
@@ -21,22 +21,21 @@
 # Python translation from wrapLabel.{cc|h} by Gian Mario Tagliaretti
 
 import gtk
-import gobject
 import pango
 
 
 class WrapLabel(gtk.Label):
     __gtype_name__ = 'WrapLabel'
 
-    def __init__(self, str=None):
+    def __init__(self, text=None):
         gtk.Label.__init__(self)
 
         self.__wrap_width = 0
         self.layout = self.get_layout()
         self.layout.set_wrap(pango.WRAP_WORD_CHAR)
 
-        if str != None:
-            self.set_text(str)
+        if text is not None:
+            self.set_text(text)
 
         self.set_alignment(0.0, 0.0)
 
@@ -50,12 +49,12 @@ class WrapLabel(gtk.Label):
         gtk.Label.do_size_allocate(self, allocation)
         self.__set_wrap_width(allocation.width)
 
-    def set_text(self, str):
-        gtk.Label.set_text(self, str)
+    def set_text(self, text):
+        gtk.Label.set_text(self, text)
         self.__set_wrap_width(self.__wrap_width)
 
-    def set_markup(self, str):
-        gtk.Label.set_markup(self, str)
+    def set_markup(self, text):
+        gtk.Label.set_markup(self, text)
         self.__set_wrap_width(self.__wrap_width)
 
     def __set_wrap_width(self, width):