summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/fsobject/directory.py5
-rw-r--r--ranger/gui/widgets/browsercolumn.py4
-rw-r--r--test/tc_directory.py2
3 files changed, 2 insertions, 9 deletions
diff --git a/ranger/fsobject/directory.py b/ranger/fsobject/directory.py
index 2941edc8..5f038ca2 100644
--- a/ranger/fsobject/directory.py
+++ b/ranger/fsobject/directory.py
@@ -375,11 +375,6 @@ class Directory(FileSystemObject, Accumulator, SettingsAware):
 		if not self.accessible: raise ranger.fsobject.NotLoadedYet()
 		return len(self.files)
 	
-	def __getitem__(self, key):
-		"""Get the file by its index"""
-		if not self.accessible: raise ranger.fsobject.NotLoadedYet()
-		return self.files[key]
-
 	def __eq__(self, other):
 		"""Check for equality of the directories paths"""
 		return isinstance(other, Directory) and self.path == other.path
diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py
index abda649d..2eb44112 100644
--- a/ranger/gui/widgets/browsercolumn.py
+++ b/ranger/gui/widgets/browsercolumn.py
@@ -59,7 +59,7 @@ class BrowserColumn(Pager, Widget):
 					self.fm.move_pointer(absolute = index)
 			elif event.pressed(3):
 				try:
-					clicked_file = self.target[index]
+					clicked_file = self.target.files[index]
 					self.fm.enter_dir(clicked_file.path)
 				except:
 					pass
@@ -201,7 +201,7 @@ class BrowserColumn(Pager, Widget):
 			i = line + self.scroll_begin
 
 			try:
-				drawed = self.target[i]
+				drawed = self.target.files[i]
 			except IndexError:
 				break
 
diff --git a/test/tc_directory.py b/test/tc_directory.py
index 45b58cf5..7634de0e 100644
--- a/test/tc_directory.py
+++ b/test/tc_directory.py
@@ -24,7 +24,6 @@ class Test1(unittest.TestCase):
 		self.assertEqual(dir.filenames, None)
 		self.assertEqual(dir.files, None)
 		self.assertRaises(fsobject.NotLoadedYet, len, dir)
-		self.assertRaises(fsobject.NotLoadedYet, dir.__getitem__, 0)
 
 	def test_after_content_loaded(self):
 		import os
@@ -66,7 +65,6 @@ class Test1(unittest.TestCase):
 		self.assertFalse(dir.accessible)
 		self.assertEqual(dir.filenames, None)
 		self.assertRaises(fsobject.NotLoadedYet, len, dir)
-		self.assertRaises(fsobject.NotLoadedYet, dir.__getitem__, 0)
 
 	def test_load_if_outdated(self):
 		import os
<hut@lavabit.com> 2013-02-18 03:22:32 +0100 committer hut <hut@lavabit.com> 2013-02-18 03:22:32 +0100 doc/rifle.1: Added man page for rifle' href='/akspecs/ranger/commit/doc/rifle.1?id=a6836d5d2b809dab92c178c3678317d8c8f00220'>a6836d5d ^
24dd1af4 ^
a6836d5d ^





























24dd1af4 ^


a6836d5d ^





24dd1af4 ^


a6836d5d ^













5eb98930 ^
a6836d5d ^





57c2dff1 ^






a6836d5d ^

57c2dff1 ^




a6836d5d ^

57c2dff1 ^




a6836d5d ^

57c2dff1 ^



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
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232