about summary refs log tree commit diff stats
path: root/ranger/core/helper.py
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2012-03-16 00:32:23 +0100
committerhut <hut@lavabit.com>2012-03-16 00:32:49 +0100
commit473dc721320e57cf6a123120337ad4054a041fde (patch)
treee9832de1992aa2c373cd70911bad6b17cf342d38 /ranger/core/helper.py
parent895be920518ab346c1e58e884d7d2a0902606d2f (diff)
downloadranger-473dc721320e57cf6a123120337ad4054a041fde.tar.gz
removed code of old file-opener system
Diffstat (limited to 'ranger/core/helper.py')
-rw-r--r--ranger/core/helper.py25
1 files changed, 1 insertions, 24 deletions
diff --git a/ranger/core/helper.py b/ranger/core/helper.py
index 07c5f0b5..31fa8623 100644
--- a/ranger/core/helper.py
+++ b/ranger/core/helper.py
@@ -29,7 +29,7 @@ def parse_arguments():
 			help="don't touch/require any config files. ")
 	parser.add_option('--copy-config', type='string', metavar='which',
 			help="copy the default configs to the local config directory. "
-			"Possible values: all, rc, apps, commands, options, scope")
+			"Possible values: all, rc, rifle, commands, options, scope")
 	parser.add_option('--fail-unless-cd', action='store_true',
 			help="experimental: return the exit code 1 if ranger is" \
 					"used to run a file (with `ranger filename`)")
@@ -95,13 +95,6 @@ def load_settings(fm, clean):
 		except ImportError:
 			pass
 
-		# Load apps
-		try:
-			import apps
-		except ImportError:
-			from ranger.defaults import apps
-		fm.apps = apps.CustomApplications()
-
 		# Load rc.conf
 		custom_conf = fm.confpath('rc.conf')
 		default_conf = fm.relpath('defaults', 'rc.conf')
@@ -138,25 +131,9 @@ def load_settings(fm, clean):
 
 		allow_access_to_confdir(ranger.arg.confdir, False)
 	else:
-		from ranger.defaults import apps
-		fm.apps = apps.CustomApplications()
 		fm.source(fm.relpath('defaults', 'rc.conf'))
 
 
-def load_apps(fm, clean):
-	import ranger
-	if not clean:
-		allow_access_to_confdir(ranger.arg.confdir, True)
-		try:
-			import apps
-		except ImportError:
-			from ranger.defaults import apps
-		allow_access_to_confdir(ranger.arg.confdir, False)
-	else:
-		from ranger.defaults import apps
-	fm.apps = apps.CustomApplications()
-
-
 def allow_access_to_confdir(confdir, allow):
 	if allow:
 		try: