summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-05-03 23:55:23 +0200
committerhut <hut@lavabit.com>2010-05-03 23:58:08 +0200
commit6278debb6ea56db29b6a1f63ac999cf71a6fb4c1 (patch)
treeafba041753f35a54572929c08e57b7249b08e365
parent4ade06a67abb6293c2695627b8b2b2c04298d8b6 (diff)
downloadranger-6278debb6ea56db29b6a1f63ac999cf71a6fb4c1.tar.gz
fsobject: removed obsolete fsobject.type attribute + constants
-rw-r--r--ranger/fsobject/__init__.py5
-rw-r--r--ranger/fsobject/fsobject.py9
2 files changed, 1 insertions, 13 deletions
diff --git a/ranger/fsobject/__init__.py b/ranger/fsobject/__init__.py
index 10997df6..cd3944c3 100644
--- a/ranger/fsobject/__init__.py
+++ b/ranger/fsobject/__init__.py
@@ -16,11 +16,6 @@
 """FileSystemObjects are representation of files and directories
 with fast access to their properties through caching"""
 
-T_FILE = 'file'
-T_DIRECTORY = 'directory'
-T_UNKNOWN = 'unknown'
-T_NONEXISTANT = 'nonexistant'
-
 BAD_INFO = '?'
 
 class NotLoadedYet(Exception):
diff --git a/ranger/fsobject/fsobject.py b/ranger/fsobject/fsobject.py
index f3d40614..18024743 100644
--- a/ranger/fsobject/fsobject.py
+++ b/ranger/fsobject/fsobject.py
@@ -24,7 +24,7 @@ import os
 from time import time
 from subprocess import Popen, PIPE
 from os.path import abspath, basename, dirname, realpath
-from . import T_FILE, T_DIRECTORY, T_UNKNOWN, T_NONEXISTANT, BAD_INFO
+from . import BAD_INFO
 from ranger.shared import MimeTypeAware, FileManagerAware
 from ranger.ext.shell_escape import shell_escape
 from ranger.ext.human_readable import human_readable
@@ -55,7 +55,6 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 	stat = None
 	infostring = None
 	permissions = None
-	type = T_UNKNOWN
 	size = 0
 
 	last_used = None
@@ -215,15 +214,9 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 			self.exists = True
 			self.accessible = True
 			if os.path.isdir(self.path):
-				self.type = T_DIRECTORY
 				self.runnable = bool(mode & stat.S_IXUSR)
-			elif os.path.isfile(self.path):
-				self.type = T_FILE
-			else:
-				self.type = T_UNKNOWN
 
 		else:
-			self.type = T_NONEXISTANT
 			self.exists = False
 			self.runnable = False
 		self.determine_infostring()