From ef187ff81ee92277f78ec8250300ff5f8d367606 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 21 Apr 2015 18:18:56 +0300 Subject: misc: format, organize imports --- src/local/server-tools/rz_backup.py | 17 +++++++++-------- src/local/server-tools/rz_doc.py | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) (limited to 'src/local') diff --git a/src/local/server-tools/rz_backup.py b/src/local/server-tools/rz_backup.py index 14c635e5..e60928ba 100755 --- a/src/local/server-tools/rz_backup.py +++ b/src/local/server-tools/rz_backup.py @@ -1,11 +1,12 @@ #!/usr/bin/python2.7 from datetime import datetime -import os -import shutil -import re from glob import glob +import os from os.path import basename, dirname, exists +import re +import shutil + root = '/var/lib/rhizi/backup' @@ -15,8 +16,8 @@ backup_template = 'backup-%s.dump' backup_glob = backup_template % '*' backup_re = re.compile(backup_template % '(\d\d\d\d)(\d\d)(\d\d)') -DAILY_KEPT = 7 # should be >= 7 -WEEKLY_KEPT = 5 # should be >= 5 +DAILY_KEPT = 7 # should be >= 7 +WEEKLY_KEPT = 5 # should be >= 5 def unlink(filename): if debug: @@ -66,7 +67,7 @@ def backup_year_month_day(filename): def to_weekly(filename): year, month, day = backup_year_month_day(filename) _, (wkly_year, wkly_month, wkly_day) = latest_weekly() - #import pdb; pdb.set_trace() + # import pdb; pdb.set_trace() delta = datetime(year, month, day) - datetime(wkly_year, wkly_month, wkly_day) return delta.days >= 7 @@ -95,8 +96,8 @@ def latest(subdir): def sorted_backups(subdir): def cmp_files(fa, fb): - ta = os.stat(fa).mtime - tb = os.stat(fb).mtime + ta = os.stat(fa).mtime + tb = os.stat(fb).mtime if ta == tb: return 0 if ta < tb: diff --git a/src/local/server-tools/rz_doc.py b/src/local/server-tools/rz_doc.py index 46187291..09cca6c9 100755 --- a/src/local/server-tools/rz_doc.py +++ b/src/local/server-tools/rz_doc.py @@ -1,21 +1,21 @@ #!/usr/bin/python2.7 -import sys -import os -import argparse # TODO - use the newer / shorter argument parser. y? +import argparse # TODO - use the newer / shorter argument parser. y? from collections import namedtuple import json +import os +import sys import uuid -# must be before any rhizi import -import rz - +import db_controller as dbc +from model.graph import Topo_Diff from neo4j_util import generate_random_id__uuid -from rz_server import init_config +import rz from rz_kernel import RZ_Kernel -from model.graph import Topo_Diff -import db_controller as dbc +from rz_server import init_config + +# must be before any rhizi import def clone(rzdoc_name): return kernel.rzdoc__clone(kernel.rzdoc__lookup_by_name(rzdoc_name)) @@ -125,7 +125,7 @@ if __name__ == '__main__': p.add_argument('--rename-from', help='rename current name') p.add_argument('--rename-to', help='rename new name') args = p.parse_args() - + if args.config_dir is None: for d in ['res/etc', '/etc/rhizi']: if os.path.exists(d): -- cgit v1.3.1