X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Futils%2Futils.py;h=8a63f1be291a92d2df863abe15bce0c12da360ac;hb=0c911454ac7f8377003a5f0d90244aa3f06b2695;hp=ff0641057afdb57ce11c57131202f9d6378cbac0;hpb=f66092201d736e21f79c713bb713a34ba721e6fa;p=mpd-sima.git diff --git a/sima/utils/utils.py b/sima/utils/utils.py index ff06410..8a63f1b 100644 --- a/sima/utils/utils.py +++ b/sima/utils/utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (c) 2010, 2011, 2013, 2014 Jack Kaliko +# Copyright (c) 2010, 2011, 2013, 2014, 2015 Jack Kaliko # # This file is part of sima # @@ -22,6 +22,7 @@ """ # pylint: disable=C0111 +import logging import traceback import sys @@ -69,8 +70,7 @@ def normalize_path(path): def exception_log(): """Log unknown exceptions""" - import logging - log = logging.getLogger('sima') + log = logging.getLogger(__name__) log.error('Unhandled Exception!!!') log.error(''.join(traceback.format_exc())) log.info('Please report the previous message' @@ -113,9 +113,11 @@ class Wfile(FileAction): """Is file writable """ def checks(self): + if isdir(self._file): + self.parser.error('need a file not a directory: {}'.format(self._file)) if not exists(self._dir): #raise ArgumentError(self, '"{0}" does not exist'.format(self._dir)) - self.parser.error('file does not exist: {0}'.format(self._dir)) + self.parser.error('directory does not exist: {0}'.format(self._dir)) if not exists(self._file): # Is parent directory writable then if not access(self._dir, W_OK):