From c3a6f2863145621fceec0f69f9563042ec6cb926 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Sun, 6 Jan 2013 21:27:29 +0100 Subject: [PATCH] Formatting --- sitarba | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sitarba b/sitarba index 160f09b..c8f18e5 100755 --- a/sitarba +++ b/sitarba @@ -50,7 +50,7 @@ class Epoch: def isRipe(self, oldest, now): - if self.unit==None: + if self.unit == None: return True delta = now-oldest @@ -120,16 +120,16 @@ class Backup: @staticmethod def fromDirName(dirname): - [strdate, strtime, epoch, mode] = dirname.split("-") + [strdate, strtime, epoch, mode] = dirname.split("-") - if not mode in Modes: - raise ValueError("Invalid mode: " + mode) + if not mode in Modes: + raise ValueError("Invalid mode: " + mode) - date = datetime.datetime(int(strdate[0:4]), - int(strdate[4:6]), int(strdate[6:8]),\ - int(strtime[0:2]), int(strtime[2:4])) + date = datetime.datetime(int(strdate[0:4]), + int(strdate[4:6]), int(strdate[6:8]),\ + int(strtime[0:2]), int(strtime[2:4])) - return Backup(date, epoch, mode) + return Backup(date, epoch, mode) def __repr__(self): return "[date: " + self.date.ctime() + \ @@ -183,7 +183,7 @@ class Config: self.sets = [] self.checksum = None self.lastchecksum = None - self.epochs = Epochs = { "sporadic" : Epoch() } + self.epochs = { "sporadic" : Epoch() } def __repr__(self): @@ -206,15 +206,15 @@ class Config: def _read_global(self, config, sec): for opt in config.options(sec): - if opt=="backupdir": + if opt == "backupdir": self.backupdir = config.get(sec, opt) if not os.path.isdir(self.backupdir): raise Config.ReadError("Backupdir '{0}' does not exist.".format(self.backupdir)) - elif opt=="format": + elif opt == "format": self.format = config.get(sec, opt) if not self.format in Config.formats: raise Config.ReadError("Invalid 'format' given.") - elif opt=="tarbin": + elif opt == "tarbin": self.tarbin = config.get(sec, opt) if not os.path.isfile(self.tarbin): raise Config.ReadError("Tar binary '{0}' does not exist.".format(self.tarbin)) @@ -237,7 +237,7 @@ class Config: e.unit = name for opt in config.options(sec): - if opt=="numkeeps": + if opt == "numkeeps": try: e.numkeeps = int(config.getint(sec, opt)) except ValueError: @@ -245,16 +245,16 @@ class Config: if e.numkeeps <= 0: raise Config.ReadError("Non-positive numkeeps '{0}' given.".format(e.numkeeps)) - elif opt=="mode": + elif opt == "mode": e.mode = config.get(sec, opt) if not e.mode in Modes: raise Config.ReadError("Invalid mode '{0}'.".format(e.mode)) - elif opt=="timespan": + elif opt == "timespan": if name in Epoch.units: raise Config.ReadError("The time delta of a standard epoch " + \ "is not supposed to be redefined. ") - td = config.get(sec,opt) + td = config.get(sec, opt) try: mult, unit = Epoch.parseTimedelta(td) e.unit = unit @@ -288,7 +288,7 @@ class Config: if opt.startswith("dir"): dirs += [config.get(sec, opt)] elif opt.startswith("exclude"): - excludes += [config.get(sec,opt)] + excludes += [config.get(sec, opt)] else: raise Config.ReadError("Unknown option '" + opt + "'.") @@ -310,7 +310,7 @@ class Config: for sec in config.sections(): - if sec=="global": + if sec == "global": self._read_global(config, sec) elif sec.startswith("epoch "): @@ -383,7 +383,7 @@ class BackupManager: continue # Get backups of that epoch - byepoch = list(sorted( [ b for b in backups if b.epoch==e], \ + byepoch = list(sorted( [ b for b in backups if b.epoch == e], \ key=lambda b: b.date)) # If there are any, determine the latest @@ -442,7 +442,7 @@ class BackupManager: # Read stdout and stderr of tarp errmsg = b"" while tarp.poll() == None: - rd,wr,ex = select.select([tarp.stdout, tarp.stderr], [], [], 0.05) + rd, wr, ex = select.select([tarp.stdout, tarp.stderr], [], [], 0.05) if tarp.stdout in rd: logging.debug( tarp.stdout.readline()[:-1].decode() ) if tarp.stderr in rd: @@ -485,7 +485,7 @@ class BackupManager: oldfullbackups = [ b for b in oldbackups if b.mode == "full" ] # No old full backups existing - if mode != "full" and len(oldfullbackups)==0: + if mode != "full" and len(oldfullbackups) == 0: logging.info("No full backups existing. Making a full backup.") # Checksum changed -> self.config file changed @@ -597,7 +597,7 @@ class BackupManager: try: shutil.rmtree(os.path.join(basedir, d)) except OSError as e: - logging.error("Error when removing '%s': %s" % (d,e.strerror) ) + logging.error("Error when removing '%s': %s" % (d, e.strerror) ) def ask_user_yesno(self, question): @@ -717,7 +717,7 @@ if __name__ == "__main__": logging.debug("Config: " + str(man.conf)) - if epoch!=None and not epoch in man.conf.epochs.keys(): + if epoch != None and not epoch in man.conf.epochs.keys(): logging.error("Unknown epoch '" + epoch + "'.") exit(1) -- 2.39.5