summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-18 01:04:00 +0200
committerhut <hut@lavabit.com>2010-04-18 01:04:00 +0200
commit7b1db25e9c7a8454f2fa6f926892d8aa05e1d17a (patch)
tree6ae29673c293e65eebe75dda479facb604c12fcc
parentf36dd272f3e6e44b6ddabe91b0fbfeb1c1d8a10e (diff)
downloadranger-7b1db25e9c7a8454f2fa6f926892d8aa05e1d17a.tar.gz
ranger.main: formatting
-rw-r--r--ranger/__main__.py8
1 files 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)
e.c?id=e3b1ac2c83c94f3303d3b4504ef458ed24d6992a'>e3b1ac2 ^
74f8cd1



































74f8cd1





















74f8cd1


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205