Commit 87414724 authored by Mark's avatar Mark

removed unused import and added psycopg2 import exception lookout

parent ccf7f49a
...@@ -3,8 +3,6 @@ from wtforms import fields ...@@ -3,8 +3,6 @@ from wtforms import fields
from peewee import (CharField, DateTimeField, DateField, TimeField, from peewee import (CharField, DateTimeField, DateField, TimeField,
PrimaryKeyField, ForeignKeyField, BaseModel) PrimaryKeyField, ForeignKeyField, BaseModel)
from playhouse.postgres_ext import ArrayField, JSONField, BinaryJSONField
from wtfpeewee.orm import ModelConverter, model_form from wtfpeewee.orm import ModelConverter, model_form
from flask_admin import form from flask_admin import form
...@@ -14,7 +12,11 @@ from flask_admin.model.fields import InlineModelFormField, InlineFieldList, Ajax ...@@ -14,7 +12,11 @@ from flask_admin.model.fields import InlineModelFormField, InlineFieldList, Ajax
from .tools import get_primary_key, get_meta_fields from .tools import get_primary_key, get_meta_fields
from .ajax import create_ajax_loader from .ajax import create_ajax_loader
try:
from playhouse.postgres_ext import JSONField, BinaryJSONField
pg_ext = True
except:
pg_ext = False
class InlineModelFormList(InlineFieldList): class InlineModelFormList(InlineFieldList):
""" """
...@@ -100,8 +102,10 @@ class CustomModelConverter(ModelConverter): ...@@ -100,8 +102,10 @@ class CustomModelConverter(ModelConverter):
self.converters[DateTimeField] = self.handle_datetime self.converters[DateTimeField] = self.handle_datetime
self.converters[DateField] = self.handle_date self.converters[DateField] = self.handle_date
self.converters[TimeField] = self.handle_time self.converters[TimeField] = self.handle_time
self.converters[JSONField] = self.handle_json
self.converters[BinaryJSONField] = self.handle_json if pg_ext:
self.converters[JSONField] = self.handle_json
self.converters[BinaryJSONField] = self.handle_json
self.overrides = getattr(self.view, 'form_overrides', None) or {} self.overrides = getattr(self.view, 'form_overrides', None) or {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment