From 008fb866fe2abdb95687c959c2395d48b9a41468 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Mon, 4 Mar 2019 17:37:33 +0300 Subject: [PATCH] minor fixes --- abonapp/migrations/0002_auto_20180808_1448.py | 10 ++++++---- abonapp/models.py | 3 +-- messenger/models.py | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/abonapp/migrations/0002_auto_20180808_1448.py b/abonapp/migrations/0002_auto_20180808_1448.py index 84db8a7..4dfbd62 100644 --- a/abonapp/migrations/0002_auto_20180808_1448.py +++ b/abonapp/migrations/0002_auto_20180808_1448.py @@ -20,14 +20,17 @@ def backup_info(apps, _): print('\tbackup_info') Abon = apps.get_model('abonapp', 'Abon') obs = Abon.objects.exclude(ip_address=None).only('ip_address', 'is_dynamic_ip') - with open(TMP_FILE, 'w') as f: - serializers.serialize('json', obs, stream=f, fields=('ip_address', 'is_dynamic_ip')) + if obs.exists(): + with open(TMP_FILE, 'w') as f: + serializers.serialize('json', obs, stream=f, fields=('ip_address', 'is_dynamic_ip')) print('\tEND backup_info') def restore_info_to_new_scheme(apps, _): print('\trestore_info_to_new_scheme') Abon = apps.get_model('abonapp', 'Abon') + if not os.path.isfile(TMP_FILE): + return with open(TMP_FILE, 'r') as f: for abon in load(f): ip_addr = abon['fields'].get('ip_address') @@ -66,8 +69,7 @@ def restore_info_to_new_scheme(apps, _): else: print('\tUser with pk=%s not found' % abon['pk']) print('\tEND restore_info_to_new_scheme') - if os.path.isfile(TMP_FILE): - os.remove(TMP_FILE) + os.remove(TMP_FILE) class Migration(migrations.Migration): diff --git a/abonapp/models.py b/abonapp/models.py index 9b4978f..8be316f 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -7,8 +7,7 @@ from django.conf import settings from django.core import validators from django.core.validators import RegexValidator from django.db import models, connection, transaction -from django.db.models.signals import pre_delete, post_init, \ - pre_save +from django.db.models.signals import post_init, pre_save from django.dispatch import receiver from django.shortcuts import resolve_url from django.utils import timezone diff --git a/messenger/models.py b/messenger/models.py index 2e0d37e..685aad2 100644 --- a/messenger/models.py +++ b/messenger/models.py @@ -1,4 +1,3 @@ -from typing import Iterable from urllib.parse import urljoin from django.conf import settings