summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-03-17 12:38:21 +0100
committerhut <hut@lavabit.com>2010-03-17 12:38:21 +0100
commit9207e83c0672c6b8b49fce3b621197fb1e77b2be (patch)
tree80d8d2875291fc29a21b94b00b460e51302c6401
parent9a735f62cfb4a16eb711750883f68f8099508f4b (diff)
downloadranger-9207e83c0672c6b8b49fce3b621197fb1e77b2be.tar.gz
fixed #69: tab completion breaks with Apps subclass
-rw-r--r--TODO2
-rw-r--r--ranger/api/apps.py8
2 files changed, 7 insertions, 3 deletions
diff --git a/TODO b/TODO
index 964cccc9..f20d542e 100644
--- a/TODO
+++ b/TODO
@@ -70,7 +70,7 @@ Bugs
    (X) #62  10/02/15  curs_set can raise an exception
    (X) #65  10/02/16  "source ranger ranger some/file.txt" shouldn't cd after exit
    ( ) #67  10/03/08  terminal title in tty
-   ( ) #69  10/03/11  tab-completion breaks with Apps subclass
+   (X) #69  10/03/11  tab-completion breaks with Apps subclass
 
 
 Ideas
diff --git a/ranger/api/apps.py b/ranger/api/apps.py
index e61b5e2c..a17a6601 100644
--- a/ranger/api/apps.py
+++ b/ranger/api/apps.py
@@ -112,8 +112,12 @@ class Applications(FileManagerAware):
 
 	def all(self):
 		"""Returns a list with all application functions"""
-		methods = self.__class__.__dict__
-		return [meth[4:] for meth in methods if meth.startswith('app_')]
+		result = set()
+		# go through all the classes in the mro (method resolution order)
+		# so subclasses will return the apps of their superclasses.
+		for cls in self.__class__.__mro__:
+			result |= set(m[4:] for m in cls.__dict__ if m.startswith('app_'))
+		return sorted(result)
 
 
 def tup(*args):
title='Blame the previous revision' href='/akkartik/mu/blame/087file.cc?h=main&id=0e6a3c0d21006a31bf45138ca8e7470d97a0e139'>^
2b250717 ^
dff1abb2 ^

78c50205 ^
734eef7c ^
dff1abb2 ^

ff16e04f ^
2b250717 ^
ff16e04f ^





a7c3f156 ^


734eef7c ^
23d3a022 ^
dff1abb2 ^




a7c3f156 ^



734eef7c ^
a7c3f156 ^
734eef7c ^
a7c3f156 ^
734eef7c ^
dff1abb2 ^
2b250717 ^
dff1abb2 ^

78c50205 ^
734eef7c ^
dff1abb2 ^

ff16e04f ^
2b250717 ^
ff16e04f ^





a7c3f156 ^


734eef7c ^
23d3a022 ^
dff1abb2 ^







734eef7c ^
dff1abb2 ^
734eef7c ^
dff1abb2 ^
734eef7c ^
dff1abb2 ^
2b250717 ^
dff1abb2 ^

dff1abb2 ^
734eef7c ^
dff1abb2 ^

10bbca64 ^
2b250717 ^
ff16e04f ^





10bbca64 ^



dff1abb2 ^


734eef7c ^
dff1abb2 ^





10bbca64 ^
dff1abb2 ^

10bbca64 ^
dff1abb2 ^






10bbca64 ^




dff1abb2 ^
fda86efe ^
dff1abb2 ^



10bbca64 ^
dff1abb2 ^

f4eee01a ^
f2043a73 ^
dff1abb2 ^

734eef7c ^
dff1abb2 ^
734eef7c ^
dff1abb2 ^
734eef7c ^
dff1abb2 ^
2b250717 ^
dff1abb2 ^

dff1abb2 ^
734eef7c ^
dff1abb2 ^

a621ef95 ^

dff1abb2 ^

ff16e04f ^
2b250717 ^
ff16e04f ^

dff1abb2 ^


734eef7c ^
dff1abb2 ^






















734eef7c ^
dff1abb2 ^
734eef7c ^
dff1abb2 ^
734eef7c ^
dff1abb2 ^
2b250717 ^
dff1abb2 ^

dff1abb2 ^
734eef7c ^
dff1abb2 ^

ff16e04f ^
2b250717 ^
ff16e04f ^


2b250717 ^
ff16e04f ^

dff1abb2 ^


734eef7c ^
dff1abb2 ^




a7c3f156 ^

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