summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/core/actions.py2
-rw-r--r--ranger/core/fm.py2
-rw-r--r--ranger/core/loader.py (renamed from ranger/fsobject/loader.py)0
-rw-r--r--ranger/fsobject/__init__.py1
4 files changed, 2 insertions, 3 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 115faaa0..00e4782b 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -27,7 +27,7 @@ from ranger.shared import FileManagerAware, EnvironmentAware, SettingsAware
 from ranger.gui.widgets import console_mode as cmode
 from ranger.fsobject import File
 from ranger.ext import shutil_generatorized as shutil_g
-from ranger.fsobject.loader import LoadableObject
+from ranger.core.loader import LoadableObject
 
 class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
 	search_method = 'ctime'
diff --git a/ranger/core/fm.py b/ranger/core/fm.py
index a426a9ae..0702e472 100644
--- a/ranger/core/fm.py
+++ b/ranger/core/fm.py
@@ -33,7 +33,7 @@ from ranger.ext.get_executables import get_executables
 from ranger.fsobject.directory import Directory
 from ranger.ext.signal_dispatcher import SignalDispatcher
 from ranger import __version__
-from ranger.fsobject import Loader
+from ranger.core.loader import Loader
 
 CTRL_C = 3
 TICKS_BEFORE_COLLECTING_GARBAGE = 100
diff --git a/ranger/fsobject/loader.py b/ranger/core/loader.py
index 4f4424e4..4f4424e4 100644
--- a/ranger/fsobject/loader.py
+++ b/ranger/core/loader.py
diff --git a/ranger/fsobject/__init__.py b/ranger/fsobject/__init__.py
index 6796f252..10997df6 100644
--- a/ranger/fsobject/__init__.py
+++ b/ranger/fsobject/__init__.py
@@ -29,4 +29,3 @@ class NotLoadedYet(Exception):
 from .fsobject import FileSystemObject
 from .file import File
 from .directory import Directory, NoDirectoryGiven
-from .loader import Loader
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 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413