diff options
| author | hut <hut@lavabit.com> | 2011-10-07 02:40:19 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-10-08 06:09:02 +0200 |
| commit | 7bf5f9672ee79489553506831b7cab54a8609077 (patch) | |
| tree | 42c9dcd2621b428027b2d4281f5c12d3dc2b0298 /ranger/core | |
| parent | afcc81964f8fa2a6e4800c725822feb0f7edebd3 (diff) | |
| download | ranger-7bf5f9672ee79489553506831b7cab54a8609077.tar.gz | |
general updates
Diffstat (limited to 'ranger/core')
| -rw-r--r-- | ranger/core/actions.py | 2 | ||||
| -rw-r--r-- | ranger/core/fm.py | 4 | ||||
| -rw-r--r-- | ranger/core/helper.py | 7 |
3 files changed, 4 insertions, 9 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 58edc56a..9f7321be 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -38,7 +38,7 @@ MACRO_FAIL = "<\x01\x01MACRO_HAS_NO_VALUE\x01\01>" class _MacroTemplate(string.Template): """A template for substituting macros in commands""" - delimiter = '%' + delimiter = ranger.MACRO_DELIMITER class Actions(FileManagerAware, EnvironmentAware, SettingsAware): search_method = 'ctime' diff --git a/ranger/core/fm.py b/ranger/core/fm.py index 9192f15c..6d772054 100644 --- a/ranger/core/fm.py +++ b/ranger/core/fm.py @@ -25,6 +25,7 @@ import stat import sys import ranger +from ranger import * from ranger.core.actions import Actions from ranger.container.tags import Tags from ranger.gui.ui import UI @@ -36,9 +37,6 @@ from ranger.ext.signals import SignalDispatcher from ranger import __version__ from ranger.core.loader import Loader -TICKS_BEFORE_COLLECTING_GARBAGE = 100 -TIME_BEFORE_FILE_BECOMES_GARBAGE = 1200 - class FM(Actions, SignalDispatcher): input_blocked = False input_blocked_until = 0 diff --git a/ranger/core/helper.py b/ranger/core/helper.py index 9a403a15..f4035ef8 100644 --- a/ranger/core/helper.py +++ b/ranger/core/helper.py @@ -20,8 +20,6 @@ import os.path import sys from ranger import * -LOGFILE = '/tmp/errorlog' - def parse_arguments(): """Parse the program arguments""" from optparse import OptionParser, SUPPRESS_HELP @@ -32,10 +30,9 @@ def parse_arguments(): if 'XDG_CONFIG_HOME' in os.environ and os.environ['XDG_CONFIG_HOME']: default_confdir = os.environ['XDG_CONFIG_HOME'] + '/ranger' else: - default_confdir = '~/.config/ranger' - usage = '%prog [options] [path/filename]' + default_confdir = CONFDIR - parser = OptionParser(usage=usage, version='ranger '+__version__) + parser = OptionParser(usage=USAGE, version='ranger '+__version__) parser.add_option('-d', '--debug', action='store_true', help="activate debug mode") |