From 24821ca5cda156c846a2308c564f51743a7f21c8 Mon Sep 17 00:00:00 2001 From: hut Date: Mon, 19 Apr 2010 22:43:29 +0200 Subject: ranger.api: import common variables --- ranger/api/__init__.py | 2 ++ ranger/api/apps.py | 1 + ranger/api/commands.py | 1 + ranger/api/keys.py | 1 + ranger/api/options.py | 1 + ranger/defaults/commands.py | 3 +-- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ranger/api/__init__.py b/ranger/api/__init__.py index cc64a7c0..8780fd15 100644 --- a/ranger/api/__init__.py +++ b/ranger/api/__init__.py @@ -2,3 +2,5 @@ Files in this module contain helper functions used in configuration files. """ + +DELETE_WARNING = 'delete seriously? ' diff --git a/ranger/api/apps.py b/ranger/api/apps.py index 126f9c2a..38d638fb 100644 --- a/ranger/api/apps.py +++ b/ranger/api/apps.py @@ -18,6 +18,7 @@ This module provides helper functions/classes for ranger.apps. """ import os, sys, re +from ranger.api import * from ranger.ext.iter_tools import flatten from ranger.ext.get_executables import get_executables from ranger.shared import FileManagerAware diff --git a/ranger/api/commands.py b/ranger/api/commands.py index fcbc5113..55bb5b54 100644 --- a/ranger/api/commands.py +++ b/ranger/api/commands.py @@ -15,6 +15,7 @@ import os from collections import deque +from ranger.api import * from ranger.shared import FileManagerAware from ranger.gui.widgets import console_mode as cmode from ranger.ext.command_parser import LazyParser as parse diff --git a/ranger/api/keys.py b/ranger/api/keys.py index 92a0269c..13a4b07f 100644 --- a/ranger/api/keys.py +++ b/ranger/api/keys.py @@ -19,6 +19,7 @@ from curses.ascii import * from inspect import getargspec, ismethod from ranger import RANGERDIR +from ranger.api import * from ranger.gui.widgets import console_mode as cmode from ranger.container.bookmarks import ALLOWED_KEYS as ALLOWED_BOOKMARK_KEYS from ranger.container.keymap import KeyMap, Direction, KeyMapWithDirections diff --git a/ranger/api/options.py b/ranger/api/options.py index 61026a4a..2a90f78d 100644 --- a/ranger/api/options.py +++ b/ranger/api/options.py @@ -16,4 +16,5 @@ import re from re import compile as regexp from ranger import colorschemes as allschemes +from ranger.api import * from ranger.gui import color diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py index 6088e8ff..c3449d63 100644 --- a/ranger/defaults/commands.py +++ b/ranger/defaults/commands.py @@ -249,7 +249,6 @@ class delete(Command): """ allow_abbrev = False - WARNING = 'delete seriously? ' def execute(self): line = parse(self.line) @@ -258,7 +257,7 @@ class delete(Command): if lastword.startswith('y'): # user confirmed deletion! return self.fm.delete() - elif self.line.startswith(delete.WARNING): + elif self.line.startswith(DELETE_WARNING): # user did not confirm deletion return -- cgit 1.4.1-2-gfad0