diff options
| -rw-r--r-- | ranger/core/fm.py | 7 | ||||
| -rw-r--r-- | ranger/core/helper.py | 3 | ||||
| -rw-r--r-- | ranger/core/main.py | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/ranger/core/fm.py b/ranger/core/fm.py index 7858c67e..f2366613 100644 --- a/ranger/core/fm.py +++ b/ranger/core/fm.py @@ -13,7 +13,6 @@ 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 @@ -200,10 +199,10 @@ class FM(Actions, SignalDispatcher): zombies.remove(zombie) gc_tick += 1 - if gc_tick > TICKS_BEFORE_COLLECTING_GARBAGE: + if gc_tick > ranger.TICKS_BEFORE_COLLECTING_GARBAGE: gc_tick = 0 - env.garbage_collect(TIME_BEFORE_FILE_BECOMES_GARBAGE, - self.tabs) + env.garbage_collect( + ranger.TIME_BEFORE_FILE_BECOMES_GARBAGE, self.tabs) except KeyboardInterrupt: # this only happens in --debug mode. By default, interrupts diff --git a/ranger/core/helper.py b/ranger/core/helper.py index 31fa8623..233f1b8a 100644 --- a/ranger/core/helper.py +++ b/ranger/core/helper.py @@ -6,12 +6,11 @@ from errno import EEXIST import os.path import sys -from ranger import * +from ranger import CONFDIR, USAGE, STABLE, __version__ def parse_arguments(): """Parse the program arguments""" from optparse import OptionParser - from ranger import __version__ from ranger.ext.openstruct import OpenStruct from os.path import expanduser diff --git a/ranger/core/main.py b/ranger/core/main.py index 8e6b9da5..37cdc586 100644 --- a/ranger/core/main.py +++ b/ranger/core/main.py @@ -5,8 +5,6 @@ The main function responsible to initialize the FM object and stuff. """ -from ranger.core.helper import * - def main(): """initialize objects and run the filemanager""" import locale @@ -16,6 +14,7 @@ def main(): from ranger.core.shared import (EnvironmentAware, FileManagerAware, SettingsAware) from ranger.core.fm import FM + from ranger.core.helper import parse_arguments, load_settings if not sys.stdin.isatty(): sys.stderr.write("Error: Must run ranger from terminal\n") |