Merge pull request #142 from pierrepo/dev/fix-weblogo

Fix weblogo weblogolib.SymbolColor/ColorGroup import
pierrepo · Dec 21, 2016 · ca63db4 · ca63db4
2 parents 44d317e + 38a3c18
commit ca63db4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,7 @@
 - Use of bumpversion to sync version across files
 - Add MDAnalysis as a mandatory module
 - Add matplotlib as a mandatory module
+- Fix weblogo weblogolib.SymbolColor/ColorGroup import 
 
 **1.3.1**
 - remove pbxplore import from setup.py and add version number

diff --git a/pbxplore/analysis/visualization.py b/pbxplore/analysis/visualization.py
@@ -15,6 +15,13 @@
 
 try:
     import weblogolib
+    # Weblogo compatibility
+    # With version < 3.5, the color class is 'ColorGroup'. In version >= 3.5,
+    # it is 'SymbolColor'. Here, we change to always have 'ColorGroup'.
+    try:
+        ColorGroup = weblogolib.SymbolColor
+    except NameError:
+        ColorGroup = weblogolib.ColorGroup
 except ImportError:
     IS_WEBLOGO = False
 else:
@@ -35,13 +42,7 @@
 except NameError:
     pass
 
-# Weblogo compatibility
-# With version < 3.5, the color class is 'ColorGroup'. In version >= 3.5,
-# it is 'SymbolColor'. Here, we change to always have 'ColorGroup'.
-try:
-    ColorGroup = weblogolib.SymbolColor
-except NameError:
-    ColorGroup = weblogolib.ColorGroup
+
 
 
 # Create the __all__ keyword according to the conditional imports