Merge branch 'develop' of github.com:rproepp/spykeviewer into develop

CHANGELOG.rst

@@ -1,4 +1,7 @@
+Version 0.4.2
+-------------
 * Data file path transform for starting plugins remotely.
+* Various bugfixes and compatibility with Spyder 2.3.0
 
 Version 0.4.1
 -------------

doc/source/index.rst

@@ -31,6 +31,11 @@ Pröpper, R. and Obermayer, K. (2013). Spyke Viewer: a flexible and extensible
 platform for electrophysiological data analysis.
 *Front. Neuroinform.* 7:26. doi: 10.3389/fninf.2013.00026
 
+The following screenshots illustrate the functionality of the program:
+
+.. image:: /img/screenshot1.png
+.. image:: /img/screenshot2.png
+
 Contents:
 
 .. toctree::

spykeviewer/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.4.1'
+__version__ = '0.4.2'
 
 import matplotlib
-matplotlib.use('Qt4Agg')
+matplotlib.use('Qt4Agg')

spykeviewer/ui/main_window.py

@@ -513,7 +513,10 @@ def run_command(self, cmd, history=True, new_prompt=True):
 
         self.console.set_codecompletion_auto(True)
         self.console.set_calltips(True)
-        self.console.setup_calltips(size=600, font=font)
+        try:
+            self.console.setup_calltips(size=600, font=font)
+        except AttributeError:  # Not needed for spyderlib >= 2.3.0
+            pass
         self.console.setup_completion(size=(370, 240), font=font)
 
         self.consoleDock.setWidget(self.console)

spykeviewer/ui/plugin_editor_dock.py

@@ -11,8 +11,20 @@
     from spyderlib.utils.module_completion import moduleCompletion \
         as module_completion
 except ImportError:  # Spyder >= 2.2.0beta3
-    from spyderlib.utils.module_completion import module_completion
-from spyderlib.utils.dochelpers import getsignaturesfromtext
+    try:
+        from spyderlib.utils.module_completion import module_completion
+    except ImportError:  # Spyder >= 2.3.0
+        try:
+            from spyderlib.utils.introspection.module_completion import \
+                module_completion
+        except ImportError:  # Spyder >= 2.3.2
+            from spyderlib.utils.introspection import module_completion
+
+try:
+    from spyderlib.utils.dochelpers import getsignaturesfromtext
+except ImportError:  # Spyder >= 2.3.0
+    from spyderlib.utils.dochelpers import getsignaturefromtext as \
+        getsignaturesfromtext
 from spyderlib.widgets.findreplace import FindReplace
 
 
@@ -102,12 +114,22 @@ def _setup_editor(self):
         font = QFont('Some font that does not exist')
         font.setStyleHint(font.TypeWriter, font.PreferDefault)
         editor = codeeditor.CodeEditor(self)
-        editor.setup_editor(
-            linenumbers=True, language='py',
-            scrollflagarea=False, codecompletion_enter=self.enter_completion,
-            tab_mode=False, edge_line=False, font=font,
-            codecompletion_auto=True, go_to_definition=True,
-            codecompletion_single=True, calltips=True)
+        try:
+            editor.setup_editor(
+                linenumbers=True, language='py',
+                scrollflagarea=False,
+                codecompletion_enter=self.enter_completion,
+                tab_mode=False, edge_line=False, font=font,
+                codecompletion_auto=True, go_to_definition=True,
+                codecompletion_single=True, calltips=True)
+        except TypeError:  # codecompletion_single is gone in 2.3.0
+            editor.setup_editor(
+                linenumbers=True, language='py',
+                scrollflagarea=False,
+                codecompletion_enter=self.enter_completion,
+                tab_mode=False, edge_line=False, font=font,
+                codecompletion_auto=True, go_to_definition=True,
+                calltips=True)
         editor.setCursor(Qt.IBeamCursor)
         editor.horizontalScrollBar().setCursor(Qt.ArrowCursor)
         editor.verticalScrollBar().setCursor(Qt.ArrowCursor)