Changeset eaad234fa0577e4412ead717f199965b5f4eeb70

Timestamp:

02/24/11 15:46:25 (15 months ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

d9837901e9ca9799810c1be87304c23342618f01

Parents:

613c5fb26da9ceaa0224cada8cbf11c409b45d84

git-committer:

Luper Rouch <luper.rouch@…> (02/24/11 15:46:25)

Message:

2.5 compat fixes

Location:

pyflu/pyflu

Files:

• __init__.py (modified) (1 diff)
• qt/bug_report/dialog.py (modified) (1 diff)
• qt/duck_widgets.py (added)
• qt/util.py (modified) (3 diffs)

pyflu/pyflu/__init__.py

@@ -5 +5 @@
 
 def version():
-    return "0.8"
+    return "0.8.1"
 

pyflu/pyflu/qt/bug_report/dialog.py

@@ -48 +48 @@
         if self.main_traceback is not None:
             parts.append(format_html_exception(*self.main_traceback,
-                    with_links=settings.DEV_MODE))
+                **{"with_links": settings.DEV_MODE}))
         for index, tb in enumerate(self.threads_tracebacks.values()):
             parts.append(u"Thread %d:" % (index + 1))
             parts.append(format_html_exception(*tb, 
-                with_links=settings.DEV_MODE))
+                **{"with_links": settings.DEV_MODE}))
         if settings.DEV_MODE:
             self.traceback_text.setHtml("".join(parts))

pyflu/pyflu/qt/util.py

@@ -1 +1 @@
 from os.path import dirname, join
+import warnings
+import types
+import functools
 from PyQt4.QtGui import (QIcon, QPixmap, QCursor, QFileDialog, QApplication, 
         qRgb, qRgba, QDialog)
 from PyQt4.QtCore import (Qt, QSettings, QVariant, PYQT_VERSION, QString,
         QCoreApplication)
-import warnings
-import types
 
 
@@ -20 +21 @@
     function.
     """
-    def f(*args, **kwargs):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
         try:
@@ -27 +29 @@
             QApplication.restoreOverrideCursor()
         return res
-    return f
+    return wrapper