From 61ee65bf3e71c422728e999b119a702d5b1712a2 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Wed, 14 Apr 2010 01:53:47 +0200
Subject: actions: move imports to top level

---
 ranger/core/actions.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 9bef8bdc..e0f36104 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -15,13 +15,18 @@
 
 import os
 import shutil
+from os.path import join, isdir
+from os import symlink, getcwd
 from inspect import cleandoc
 
 import ranger
-from ranger.shared import EnvironmentAware, SettingsAware
 from ranger import fsobject
+from ranger.ext.direction import Direction
+from ranger.shared import FileManagerAware, EnvironmentAware, SettingsAware
 from ranger.gui.widgets import console_mode as cmode
 from ranger.fsobject import File
+from ranger.ext import shutil_generatorized as shutil_g
+from ranger.fsobject.loader import LoadableObject
 
 class Actions(EnvironmentAware, SettingsAware):
 	search_method = 'ctime'
@@ -518,14 +523,7 @@ class Actions(EnvironmentAware, SettingsAware):
 		self.ui.browser.main_column.request_redraw()
 
 	def paste_symlink(self):
-		from os import symlink, getcwd
-		from os.path import join
-
 		copied_files = self.env.copy
-
-		if not copied_files:
-			return
-
 		for f in copied_files:
 			try:
 				symlink(f.path, join(getcwd(), f.basename))
@@ -534,9 +532,6 @@ class Actions(EnvironmentAware, SettingsAware):
 
 	def paste(self, overwrite=False):
 		"""Paste the selected items into the current directory"""
-		from os.path import join, isdir
-		from ranger.ext import shutil_generatorized as shutil_g
-		from ranger.fsobject.loader import LoadableObject
 		copied_files = tuple(self.env.copy)
 
 		if not copied_files:
@@ -592,7 +587,7 @@ class Actions(EnvironmentAware, SettingsAware):
 		self.env.copy -= set(selected)
 		if selected:
 			for f in selected:
-				if os.path.isdir(f.path) and not os.path.islink(f.path):
+				if isdir(f.path) and not os.path.islink(f.path):
 					try:
 						shutil.rmtree(f.path)
 					except OSError as err:
-- 
cgit 1.4.1-2-gfad0


From ab5d63be742a6d6ca10443c12d561b0a1c861474 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Wed, 14 Apr 2010 01:54:08 +0200
Subject: ranger.help: update

---
 ranger/help/console.py  | 2 +-
 ranger/help/movement.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ranger/help/console.py b/ranger/help/console.py
index 3a4428f3..76ce9f59 100644
--- a/ranger/help/console.py
+++ b/ranger/help/console.py
@@ -149,7 +149,7 @@ the flag "-OO" which removes all docstrings.)
 ==============================================================================
 3.4. The Open Console
 
-Open this console by pressing "!"
+Open this console by pressing "!" or "s"
 
 The Open Console allows you to execute shell commands:
 !vim *         will run vim and open all files in the directory.
diff --git a/ranger/help/movement.py b/ranger/help/movement.py
index 4ea2b0c3..f6a70eb1 100644
--- a/ranger/help/movement.py
+++ b/ranger/help/movement.py
@@ -77,7 +77,7 @@ These keys work like in vim:
 
 	i	inspect the content of the file
 	E	edit the file
-	s	open a shell, starting in the current directory
+	S	open a shell, starting in the current directory
 
 Marking files allows you to use operations on multiple files at once.
 If there are any marked files in this directory, "yy" will copy them instead
-- 
cgit 1.4.1-2-gfad0