From 7b1db25e9c7a8454f2fa6f926892d8aa05e1d17a Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Sun, 18 Apr 2010 01:04:00 +0200
Subject: ranger.main: formatting

---
 ranger/__main__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ranger/__main__.py b/ranger/__main__.py
index ae3f3221..4da9bb73 100644
--- a/ranger/__main__.py
+++ b/ranger/__main__.py
@@ -48,6 +48,7 @@ def parse_arguments():
 
 	return arg
 
+
 def load_settings(fm):
 	if not ranger.arg.clean:
 		try:
@@ -125,7 +126,6 @@ def main():
 
 	SettingsAware._setup()
 
-	# Initialize objects
 	if arg.targets:
 		target = arg.targets[0]
 		if not os.access(target, os.F_OK):
@@ -142,10 +142,9 @@ def main():
 	else:
 		path = '.'
 
-	EnvironmentAware._assign(Environment(path))
-	SettingsAware._setup_keys()
-
 	try:
+		# Initialize objects
+		EnvironmentAware._assign(Environment(path))
 		fm = FM()
 		load_settings(fm)
 		FileManagerAware._assign(fm)
@@ -162,6 +161,7 @@ def main():
 		except (AttributeError, NameError):
 			pass
 
+
 if __name__ == '__main__':
 	top_dir = os.path.dirname(sys.path[0])
 	sys.path.insert(0, top_dir)
-- 
cgit 1.4.1-2-gfad0