diff options
| -rw-r--r-- | ranger/__init__.py | 18 | ||||
| -rw-r--r-- | ranger/ext/debug.py | 34 | ||||
| -rw-r--r-- | ranger/fm.py | 2 |
3 files changed, 16 insertions, 38 deletions
diff --git a/ranger/__init__.py b/ranger/__init__.py index 5ffbf998..f6913bb5 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -18,8 +18,7 @@ import os import sys -# for easier access -from ranger.ext.debug import log, trace +LOGFILE = '/tmp/errorlog' __copyright__ = """ Copyright (C) 2009, 2010 Roman Zimbelmann <romanz@lavabit.com> @@ -34,13 +33,26 @@ __email__ = 'romanz@lavabit.com' debug = False -CONFDIR = os.path.expanduser('~/.ranger') +CONFDIR = os.path.expanduser(os.path.join('~', '.config', 'ranger')) RANGERDIR = os.path.dirname(__file__) sys.path.append(CONFDIR) USAGE = '%prog [options] [path/filename]' +#for python3-only versions, this could be replaced with: +# +#def log(*objects, start='ranger:', sep=' ', end='\n'): +# print(start, *objects, end=end, sep=sep, file=open(LOGFILE, 'a')) +def log(*objects, **keywords): + """Writes objects to a logfile. + Has the same arguments as print() in python3""" + start = 'start' in keywords and keywords['start'] or 'ranger:' + sep = 'sep' in keywords and keywords['sep'] or ' ' + _file = 'file' in keywords and keywords['file'] or open(LOGFILE, 'a') + end = 'end' in keywords and keywords['end'] or '\n' + _file.write(sep.join(map(str, (start, ) + objects)) + end) + def relpath(*paths): """returns the path relative to rangers library directory""" return os.path.join(RANGERDIR, *paths) diff --git a/ranger/ext/debug.py b/ranger/ext/debug.py deleted file mode 100644 index 88f43340..00000000 --- a/ranger/ext/debug.py +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2009, 2010 Roman Zimbelmann <romanz@lavabit.com> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -LOGFILE = '/tmp/errorlog' - -def log(*objects, **keywords): - """Writes objects to a logfile. - Has the same arguments as print() in python3""" - start = 'start' in keywords and keywords['start'] or 'ranger:' - sep = 'sep' in keywords and keywords['sep'] or ' ' - _file = 'file' in keywords and keywords['file'] or open(LOGFILE, 'a') - end = 'end' in keywords and keywords['end'] or '\n' - _file.write(sep.join(map(str, (start, ) + objects)) + end) - -#for python3-only versions, this could be replaced with: -# -#def log(*objects, start='ranger:', sep=' ', end='\n'): -# print(start, *objects, end=end, sep=sep, file=open(LOGFILE, 'a')) - -def trace(): - from traceback import print_stack - print_stack(file=open(LOGFILE, 'a')) diff --git a/ranger/fm.py b/ranger/fm.py index d2250347..a10e9af6 100644 --- a/ranger/fm.py +++ b/ranger/fm.py @@ -72,7 +72,7 @@ class FM(Actions): from ranger.container.tags import Tags if self.tags is None: - self.tags = Tags('~/.ranger/tagged') + self.tags = Tags(relpath_conf('tagged')) if self.ui is None: from ranger.gui.defaultui import DefaultUI |