From: Antonio Ospite <ao2@ao2.it>
Date: Fri, 3 Oct 2014 09:56:12 +0000 (+0200)
Subject: Fix importing the publisher class
X-Git-Url: https://git.ao2.it/PoPiPaint.git/commitdiff_plain/30903969839d27e95dd456d3e2155e3ead2069b6?ds=inline

Fix importing the publisher class

Use the new name directly to fix errors like this one:

Traceback (most recent call last):
  File "./PoPiPaint.py", line 22, in <module>
    import CanvasFrame
  File ".../CanvasFrame.py", line 22, in <module>
    import CanvasModel
  File ".../CanvasModel.py", line 21, in <module>
    from wx.lib.pubsub import Publisher as pub
ImportError: cannot import name Publisher
---

diff --git a/CanvasFrame.py b/CanvasFrame.py
index 9822c4d..360e3e1 100755
--- a/CanvasFrame.py
+++ b/CanvasFrame.py
@@ -16,7 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import wx
-from wx.lib.pubsub import Publisher as pub
+from wx.lib.pubsub import setuparg1
+from wx.lib.pubsub import pub
 from wx.lib.wordwrap import wordwrap
 
 import CanvasModel
diff --git a/CanvasModel.py b/CanvasModel.py
index 49f9f64..d61f00b 100755
--- a/CanvasModel.py
+++ b/CanvasModel.py
@@ -18,7 +18,8 @@
 import sys
 from array import array
 import wx
-from wx.lib.pubsub import Publisher as pub
+from wx.lib.pubsub import setuparg1
+from wx.lib.pubsub import pub
 
 
 class Canvas: