summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-10-10 23:40:08 +0200
committerhut <hut@lavabit.com>2011-10-10 23:40:08 +0200
commit5fd44f5ad9093dee5f62d37c0e89d95e8da8d64f (patch)
tree3270770f622c9abccdf3ca8f47d6d6d8809bbc18
parent28af9c88ecd6a2372a18bc7b8a5040f5a42d2f27 (diff)
downloadranger-5fd44f5ad9093dee5f62d37c0e89d95e8da8d64f.tar.gz
container.__init__: removed import shortcuts
-rw-r--r--ranger/container/__init__.py2
-rw-r--r--ranger/core/environment.py2
-rw-r--r--ranger/core/fm.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/ranger/container/__init__.py b/ranger/container/__init__.py
index 21a336bc..62ddc67a 100644
--- a/ranger/container/__init__.py
+++ b/ranger/container/__init__.py
@@ -2,5 +2,3 @@
 This package includes container-objects which are
 used to manage stored data
 """
-from ranger.container.history import History
-from .bookmarks import Bookmarks
diff --git a/ranger/core/environment.py b/ranger/core/environment.py
index 8ea8fd65..1f37bde5 100644
--- a/ranger/core/environment.py
+++ b/ranger/core/environment.py
@@ -21,7 +21,7 @@ from os.path import abspath, normpath, join, expanduser, isdir
 
 from ranger.fsobject import Directory
 from ranger.ext.keybinding_parser import KeyBuffer, KeyMaps
-from ranger.container import History
+from ranger.container.history import History
 from ranger.ext.signals import SignalDispatcher
 from ranger.core.shared import SettingsAware
 
diff --git a/ranger/core/fm.py b/ranger/core/fm.py
index a8cba91b..4383a9ab 100644
--- a/ranger/core/fm.py
+++ b/ranger/core/fm.py
@@ -29,7 +29,7 @@ from ranger import *
 from ranger.core.actions import Actions
 from ranger.container.tags import Tags
 from ranger.gui.ui import UI
-from ranger.container import Bookmarks
+from ranger.container.bookmarks import Bookmarks
 from ranger.core.runner import Runner
 from ranger.ext.get_executables import get_executables
 from ranger.fsobject import Directory
/a> ^
9570363a ^
672e3e50 ^





9570363a ^


672e3e50 ^

9570363a ^

672e3e50 ^
c5ffb6e1 ^

9570363a ^

c5ffb6e1 ^
9570363a ^


672e3e50 ^




90560d71 ^
d5d908dd ^
90560d71 ^
672e3e50 ^
d5d908dd ^
c5ffb6e1 ^



76755b28 ^


672e3e50 ^
90560d71 ^
672e3e50 ^

90560d71 ^
672e3e50 ^

d5d908dd ^
90560d71 ^

672e3e50 ^

d5d908dd ^
76755b28 ^




65361948 ^
672e3e50 ^


76755b28 ^




672e3e50 ^

c5ffb6e1 ^
90560d71 ^
65361948 ^
76755b28 ^
672e3e50 ^

90560d71 ^
65361948 ^
76755b28 ^
672e3e50 ^

90560d71 ^
65361948 ^
76755b28 ^




672e3e50 ^

76755b28 ^


dcc060c7 ^
76755b28 ^

672e3e50 ^
90560d71 ^
76755b28 ^

4fe9f5e8 ^


672e3e50 ^
76755b28 ^





65361948 ^
d009e158 ^




76755b28 ^
672e3e50 ^

76755b28 ^

4fe9f5e8 ^


76755b28 ^
4fe9f5e8 ^

76755b28 ^
4fe9f5e8 ^
90560d71 ^
4fe9f5e8 ^
76755b28 ^
4fe9f5e8 ^
672e3e50 ^


90560d71 ^
672e3e50 ^


90560d71 ^
65361948 ^
76755b28 ^
672e3e50 ^




90560d71 ^
d5d908dd ^
76755b28 ^




65361948 ^
90560d71 ^
d5d908dd ^
76755b28 ^
672e3e50 ^

672e3e50 ^



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