From 8f150089d8c5daa4afed79fc3725641d96918f57 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 20 Jan 2017 12:50:24 +0000 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=81=D1=8E=D0=B4=D0=B0=20=D0=B8=D0=B7=20?= =?UTF-8?q?=D0=BA=D0=BE=D1=80=D0=BD=D0=B5=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/load_dot_from_nodeny.py | 2 +- load_from_nodeny.py => djing/utils/load_from_nodeny.py | 2 +- .../utils/save_dot_from_nodeny.py | 4 ++-- save_from_nodeny.py => djing/utils/save_from_nodeny.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename load_dot_from_nodeny.py => djing/utils/load_dot_from_nodeny.py (95%) rename load_from_nodeny.py => djing/utils/load_from_nodeny.py (97%) rename save_dot_from_nodeny.py => djing/utils/save_dot_from_nodeny.py (87%) rename save_from_nodeny.py => djing/utils/save_from_nodeny.py (91%) diff --git a/load_dot_from_nodeny.py b/djing/utils/load_dot_from_nodeny.py similarity index 95% rename from load_dot_from_nodeny.py rename to djing/utils/load_dot_from_nodeny.py index a8f130c..9a5b298 100644 --- a/load_dot_from_nodeny.py +++ b/djing/utils/load_dot_from_nodeny.py @@ -27,6 +27,6 @@ if __name__ == "__main__": res = cursor.fetchone() db.close() - f = open('places.json', 'w') + f = open('../../places.json', 'w') f.write(dumps(places, ensure_ascii=False).encode('utf8')) f.close() diff --git a/load_from_nodeny.py b/djing/utils/load_from_nodeny.py similarity index 97% rename from load_from_nodeny.py rename to djing/utils/load_from_nodeny.py index 082c8bf..7e801d0 100755 --- a/load_from_nodeny.py +++ b/djing/utils/load_from_nodeny.py @@ -43,6 +43,6 @@ if __name__ == "__main__": res = cursor.fetchone() db.close() - f = open('dump.json', 'w') + f = open('../../dump.json', 'w') f.write(dumps(result, ensure_ascii=False).encode('utf8')) f.close() diff --git a/save_dot_from_nodeny.py b/djing/utils/save_dot_from_nodeny.py similarity index 87% rename from save_dot_from_nodeny.py rename to djing/utils/save_dot_from_nodeny.py index 5b546d1..1b5dbcb 100644 --- a/save_dot_from_nodeny.py +++ b/djing/utils/save_dot_from_nodeny.py @@ -11,7 +11,7 @@ if __name__ == "__main__": django.setup() from devapp.models import Device - with open('places.json', 'r') as f: + with open('../../places.json', 'r') as f: dat = load(f) for dt in dat: @@ -26,4 +26,4 @@ if __name__ == "__main__": ) dev.comment=dt['loc'] dev.save() - print dt['descr'], dt['loc'], dev + print(dt['descr'], dt['loc'], dev) diff --git a/save_from_nodeny.py b/djing/utils/save_from_nodeny.py similarity index 91% rename from save_from_nodeny.py rename to djing/utils/save_from_nodeny.py index 59b857c..1a404fc 100755 --- a/save_from_nodeny.py +++ b/djing/utils/save_from_nodeny.py @@ -12,7 +12,7 @@ if __name__ == "__main__": django.setup() from abonapp.models import Abon, AbonGroup - with open('dump.json', 'r') as f: + with open('../../dump.json', 'r') as f: dat = load(f) for dt in dat['groups']: @@ -35,4 +35,4 @@ if __name__ == "__main__": abon.address=dt['addr'] abon.group=grp abon.save() - print abon.username, abon.fio, abon.group + print(abon.username, abon.fio, abon.group)