Skip to content

Commit 8741472

Browse files
committed
removed unused import and added psycopg2 import exception lookout
1 parent ccf7f49 commit 8741472

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

flask_admin/contrib/peewee/form.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
from peewee import (CharField, DateTimeField, DateField, TimeField,
44
PrimaryKeyField, ForeignKeyField, BaseModel)
55

6-
from playhouse.postgres_ext import ArrayField, JSONField, BinaryJSONField
7-
86
from wtfpeewee.orm import ModelConverter, model_form
97

108
from flask_admin import form
@@ -14,7 +12,11 @@
1412

1513
from .tools import get_primary_key, get_meta_fields
1614
from .ajax import create_ajax_loader
17-
15+
try:
16+
from playhouse.postgres_ext import JSONField, BinaryJSONField
17+
pg_ext = True
18+
except:
19+
pg_ext = False
1820

1921
class InlineModelFormList(InlineFieldList):
2022
"""
@@ -100,8 +102,10 @@ def __init__(self, view, additional=None):
100102
self.converters[DateTimeField] = self.handle_datetime
101103
self.converters[DateField] = self.handle_date
102104
self.converters[TimeField] = self.handle_time
103-
self.converters[JSONField] = self.handle_json
104-
self.converters[BinaryJSONField] = self.handle_json
105+
106+
if pg_ext:
107+
self.converters[JSONField] = self.handle_json
108+
self.converters[BinaryJSONField] = self.handle_json
105109

106110
self.overrides = getattr(self.view, 'form_overrides', None) or {}
107111

0 commit comments

Comments
 (0)