Merge e34e878 into 2d9fe51

pytroll · Jan 28, 2020 · 5836451 · 5836451
2 parents 2d9fe51 + e34e878
commit 5836451
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pydecorate/decorator_agg.py b/pydecorate/decorator_agg.py
@@ -17,12 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from pydecorate.decorator_base import DecoratorBase
 
-try:
-    from PIL import ImageDraw
-except ImportError:
-    print("ImportError: Missing module: ImageDraw")
-
-
 class DecoratorAGG(DecoratorBase):
 
     def add_scale(self, colormap, **kwargs):

diff --git a/pydecorate/decorator_base.py b/pydecorate/decorator_base.py
@@ -242,8 +242,10 @@ def _check_align(self):
     def _get_current_font(self):
         if self.style['font'] is None:
             self.style['font'] = self._load_default_font()
-        else:
+        elif isinstance(self.style['font'], str):
             self.style['font'] = self._load_font()
+        else:
+            pass  # assume self.style['font'] has already been assigned as Font obj. FIXME
 
     def _add_text(self, txt, **kwargs):
         # synchronize kwargs into style