Merge branch 'delete_previewed_file_fix' of https://github.com/Vifon/ranger - ranger - mirror of ranger

diff options

author	hut <hut@lepus.uberspace.de>	2015-02-17 20:09:06 +0100
committer	hut <hut@lepus.uberspace.de>	2015-02-17 20:09:06 +0100
commit	5f1db740b6a956562023bf11facefb0c11f16e83 (patch)
tree	bf5e10b66d77ee29345ea5ad4a969e3c308d33d9
parent	45231bda1010421be002e5c485a07539edb0b140 (diff)
parent	3630c8a928d242031ba5c67e3103abb4ac9253fa (diff)
download	ranger-5f1db740b6a956562023bf11facefb0c11f16e83.tar.gz

Merge branch 'delete_previewed_file_fix' of https://github.com/Vifon/ranger

Diffstat

-rw-r--r--

ranger/core/actions.py

1 files changed, 1 insertions, 1 deletions

# 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/>. import os from curses import * from curses.ascii import * from inspect import getargspec, ismethod from ranger import RANGERDIR from ranger.gui.widgets import console_mode as cmode from ranger.container.bookmarks import ALLOWED_KEYS as ALLOWED_BOOKMARK_KEYS def make_abbreviations(command_list): def bind(*args, **keywords): if keywords: command_list.show(*args, **keywords) else: lastarg = args[-1] if hasattr(lastarg, '__call__'): # do the binding command_list.bind(lastarg, *args[:-1]) else: # act as a decorator. eg: # @bind('a') # def do_stuff(arg): # arg.fm.ui.do_stuff() # # is equivalent to: # bind('a', lambda arg: arg.fm.ui.do_stuff()) return lambda fnc: command_list.bind(fnc, *args) def show(*args, **keywords): command_list.show(*args, **keywords) def alias(*args): command_list.alias(*args) return bind, alias class Wrapper(object): def __init__(self, firstattr): self.__firstattr__ = firstattr def __getattr__(self, attr): if attr.startswith('_'): raise AttributeError def wrapper(*real_args, **real_keywords): def function(command_argument): args, kws = real_args, real_keywords number = command_argument.n obj = getattr(command_argument, self.__firstattr__) fnc = getattr(obj, attr) if number is not None: args, kws = replace_narg(number, fnc, args, kws) return fnc(*args, **kws) return function return wrapper # fm.enter_dir('~') is translated into lambda arg: arg.fm.enter_dir('~') # this makes things like this possible: # bind('gh', fm.enter_dir('~')) # # but NOT: (note the 2 dots) # bind('H', fm.history.go(-1)) # # for something like that, use the long version: # bind('H', lambda arg: arg.fm.history.go(-1)) # # If the method has an argument named "narg", pressing a number before # the key will pass that number as the narg argument. If you want the # same behaviour in a custom lambda function, you can write: # bind('gg', fm.move_pointer(absolute=0)) # as: # bind('gg', lambda arg: narg(arg.n, arg.fm.move_pointer, absolute=0)) fm = Wrapper('fm') wdg = Wrapper('wdg') NARG_KEYWORD = 'narg' def narg(number_, function_, *args_, **keywords_): """ This applies the replace_narg function to the arguments and keywords and directly runs this function. Example: def foo(xyz, narg): return hash((xyz, narg)) narg(50, foo, 123) == foo(123, narg=50) """ args, keywords = replace_narg(number_, function_, args_, keywords_) print(args, keywords) return function_(*args, **keywords) def replace_narg(number, function, args, keywords): """ This function returns (args, keywords) with one little change: if <function> has a named argument called "narg", args and keywords will be modified so that the value of "narg" will be <number>. def foo(xyz, narg): pass replace_narg(666, foo, (), {'narg': 10, 'xyz': 5}) => (), {'narg': 666, 'xyz': 5} replace_narg(666, foo, (1, 2), {}) => (1, 666), {} """ argspec = getargspec(function).args if NARG_KEYWORD in argspec: try: # is narg in args? args = list(args) index = argspec.index(NARG_KEYWORD) if ismethod(function): index -= 1 # because of 'self' args[index] = number except (ValueError, IndexError): # is narg in keywords? keywords = dict(keywords) keywords[NARG_KEYWORD] = number return args, keywords


context:
space:
mode: