From 3e405a690be62fb1964f2597f399f51112f02868 Mon Sep 17 00:00:00 2001 From: Wardal Date: Wed, 25 Oct 2017 15:38:40 +0300 Subject: [PATCH] Python3 support --- flakeplus/__init__.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/flakeplus/__init__.py b/flakeplus/__init__.py index 3418c0e..8ecc320 100755 --- a/flakeplus/__init__.py +++ b/flakeplus/__init__.py @@ -190,15 +190,24 @@ def die(self, msg): return EX_USAGE def expanduser(self, value): - if isinstance(value, basestring): - return os.path.expanduser(value) + try: + if isinstance(value, basestring): + return os.path.expanduser(value) + except NameError: + if isinstance(value, str): + return os.path.expanduser(value) return value def handle_argv(self, prog_name, argv): options, args = self.parse_options(prog_name, argv) - options = dict((k, self.expanduser(v)) - for k, v in vars(options).iteritems() - if not k.startswith('_')) + try: + options = dict((k, self.expanduser(v)) + for k, v in vars(options).iteritems() + if not k.startswith('_')) + except AttributeError: + options = dict((k, self.expanduser(v)) + for k, v in vars(options).items() + if not k.startswith('_')) argv = map(self.expanduser, argv) if not argv: return self.die('No input files/directories')