Fix import issues when asyncpg is not installed

Mino-shiro · Aug 13, 2017 · 82ded45 · 82ded45
1 parent 7b3babb
commit 82ded45
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-0.1.0
+0.1.1
diff --git a/minoshiro/data_controller/postgres_controller.py b/minoshiro/data_controller/postgres_controller.py
@@ -2,8 +2,14 @@
 from json import dumps, loads
 from typing import Dict, Optional
 
-from asyncpg import InterfaceError, create_pool
-from asyncpg.pool import Pool
+try:
+    from asyncpg import InterfaceError, create_pool
+    from asyncpg.pool import Pool
+except ImportError:
+    print('asyncpg not installed, PostgresSQL function not available.')
+    Pool = None
+    InterfaceError = None
+    create_pool = None
 
 from minoshiro.enums import Medium, Site
 from minoshiro.logger import get_default_logger

diff --git a/minoshiro/data_controller/postgres_utils.py b/minoshiro/data_controller/postgres_utils.py
@@ -4,8 +4,13 @@
 
 from typing import Optional
 
-from asyncpg import Record
-from asyncpg.pool import Pool
+try:
+    from asyncpg import Record
+    from asyncpg.pool import Pool
+except ImportError:
+    Record = None
+    Pool = None
+    print('asyncpg not installed, PostgresSQL function not available.')
 
 
 def parse_record(record: Record) -> Optional[tuple]: