about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2013-03-12 14:37:36 +0100
committerhut <hut@lavabit.com>2013-03-12 14:37:36 +0100
commit6154e8d6fb204f13c637df275718f978010df33a (patch)
tree5efc2d376c5533bf9bf81c6dc86a312b2fd1d4f1
parentf0a7599df497fa673cd08426be297362b1e1bf87 (diff)
downloadranger-6154e8d6fb204f13c637df275718f978010df33a.tar.gz
container.fsobject: make it "SettingsAware"
-rw-r--r--ranger/container/directory.py3
-rw-r--r--ranger/container/file.py3
-rw-r--r--ranger/container/fsobject.py4
3 files changed, 4 insertions, 6 deletions
diff --git a/ranger/container/directory.py b/ranger/container/directory.py
index 78ff82e5..970e16b4 100644
--- a/ranger/container/directory.py
+++ b/ranger/container/directory.py
@@ -12,7 +12,6 @@ from ranger.container.fsobject import BAD_INFO, FileSystemObject
 from ranger.core.loader import Loadable
 from ranger.ext.mount_path import mount_path
 from ranger.container.file import File
-from ranger.core.shared import SettingsAware
 from ranger.ext.accumulator import Accumulator
 from ranger.ext.lazy_property import lazy_property
 from ranger.ext.human_readable import human_readable
@@ -45,7 +44,7 @@ def accept_file(fname, directory, hidden_filter, name_filter):
         return False
     return True
 
-class Directory(FileSystemObject, Accumulator, Loadable, SettingsAware):
+class Directory(FileSystemObject, Accumulator, Loadable):
     is_directory = True
     enterable = False
     load_generator = None
diff --git a/ranger/container/file.py b/ranger/container/file.py
index b6a96a20..95d9b284 100644
--- a/ranger/container/file.py
+++ b/ranger/container/file.py
@@ -3,7 +3,6 @@
 
 import re
 from ranger.container.fsobject import FileSystemObject
-from ranger.core.shared import SettingsAware
 
 N_FIRST_BYTES = 256
 control_characters = set(chr(n) for n in
@@ -38,7 +37,7 @@ PREVIEW_WHITELIST = re.compile(r"""
         $
 """, re.VERBOSE | re.IGNORECASE)
 
-class File(FileSystemObject, SettingsAware):
+class File(FileSystemObject):
     is_file = True
     preview_data = None
     preview_known = False
diff --git a/ranger/container/fsobject.py b/ranger/container/fsobject.py
index f03fef7a..01f9348b 100644
--- a/ranger/container/fsobject.py
+++ b/ranger/container/fsobject.py
@@ -15,7 +15,7 @@ BAD_INFO = '?'
 import re
 from os import lstat, stat
 from os.path import abspath, basename, dirname, realpath, splitext, extsep
-from ranger.core.shared import FileManagerAware
+from ranger.core.shared import FileManagerAware, SettingsAware
 from ranger.ext.shell_escape import shell_escape
 from ranger.ext.spawn import spawn
 from ranger.ext.lazy_property import lazy_property
@@ -32,7 +32,7 @@ _extract_number_re = re.compile(r'([^0-9]?)(\d*)')
 def safe_path(path):
     return path.translate(_safe_string_table)
 
-class FileSystemObject(FileManagerAware):
+class FileSystemObject(FileManagerAware, SettingsAware):
     (basename,
     basename_lower,
     dirname,
>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 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478