0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

python3 only: remove six.moves imports

Browse source
This commit is contained in:
j 2020-05-29 12:17:18 +02:00
commit 548a73f121
33 changed files with 75 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pandora/entity/models.py
View file

@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-
from glob import glob
from urllib.parse import quote, unquote
import os
import re
from glob import glob
import unicodedata
from six import string_types
from six.moves.urllib.parse import quote, unquote
from django.db import models, transaction
from django.db.models import Max
from django.contrib.auth import get_user_model
@ -188,7 +187,7 @@ class Entity(models.Model):
.delete()
else:
#FIXME: more data validation
if isinstance(data[key], string_types):
if isinstance(data[key], str):
self.data[key] = ox.sanitize_html(data[key])
else:
self.data[key] = data[key]
@ -275,7 +274,7 @@ class Entity(models.Model):
f, created = Find.objects.get_or_create(entity=self, key=key)
if isinstance(value, bool):
value = value and 'true' or 'false'
if isinstance(value, string_types):
if isinstance(value, str):
value = ox.decode_html(ox.strip_tags(value.strip()))
value = unicodedata.normalize('NFKD', value).lower()
f.value = value

3
pandora/entity/views.py
View file

@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
from six import string_types
import ox
from ox.utils import json
from oxdjango.api import actions
@ -69,7 +68,7 @@ def addEntity(request, data):
for key in ('type', 'alternativeNames'):
if key in data and data[key]:
value = data[key]
if isinstance(value, string_types):
if isinstance(value, str):
value = ox.escape_html(value)
if key == 'alternativeNames':
value = tuple([ox.escape_html(v) for v in value])