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)