renamed fsobject.islink to fsobject.is_link

5 files changed, 9 insertions, 9 deletions

diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py
index e69dcf90..2bb860bd 100644
--- a/ranger/defaults/commands.py
+++ b/ranger/defaults/commands.py
@@ -332,7 +332,7 @@ class delete(Command):
 		cwd = self.fm.env.cwd
 		cf = self.fm.env.cf
 
-		if cwd.marked_items or (cf.is_directory and not cf.islink \
+		if cwd.marked_items or (cf.is_directory and not cf.is_link \
 				and len(os.listdir(cf.path)) > 0):
 			# better ask for a confirmation, when attempting to
 			# delete multiple files or a non-empty directory.
diff --git a/ranger/fsobject/fsobject.py b/ranger/fsobject/fsobject.py
index 5dbad537..3af494b4 100644
--- a/ranger/fsobject/fsobject.py
+++ b/ranger/fsobject/fsobject.py
@@ -40,7 +40,7 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 	tagged = False
 	loaded = False
 	runnable = False
-	islink = False
+	is_link = False
 	is_device = False
 	readlink = None
 	stat = None
@@ -166,11 +166,11 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 			self.stat = os.lstat(self.path)
 		except OSError:
 			self.stat = None
-			self.islink = False
+			self.is_link = False
 			self.accessible = False
 		else:
 			mode = self.stat.st_mode
-			self.islink = stat.S_ISLNK(mode)
+			self.is_link = stat.S_ISLNK(mode)
 			self.is_device = bool(stat.S_ISCHR(mode) or stat.S_ISBLK(mode))
 			self.accessible = True
 
@@ -197,7 +197,7 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 				self.infostring = None
 
 		else:
-			if self.islink:
+			if self.is_link:
 				self.infostring = '->'
 			else:
 				self.infostring = None
@@ -205,7 +205,7 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 			self.exists = False
 			self.runnable = False
 
-		if self.islink:
+		if self.is_link:
 			self.readlink = os.readlink(self.path)
 
 	def get_permission_string(self):
diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py
index 63bee33d..0ef37ef1 100644
--- a/ranger/gui/widgets/browsercolumn.py
+++ b/ranger/gui/widgets/browsercolumn.py
@@ -287,7 +287,7 @@ class BrowserColumn(Pager):
 			if self.env.copy and drawn in self.env.copy:
 				this_color.append('cut' if self.env.cut else 'copied')
 
-			if drawn.islink:
+			if drawn.is_link:
 				this_color.append('link')
 				this_color.append(drawn.exists and 'good' or 'bad')
 
diff --git a/ranger/gui/widgets/statusbar.py b/ranger/gui/widgets/statusbar.py
index caf5786e..db415129 100644
--- a/ranger/gui/widgets/statusbar.py
+++ b/ranger/gui/widgets/statusbar.py
@@ -159,7 +159,7 @@ class StatusBar(Widget):
 		left.add_space()
 		left.add(self._get_group(target), 'group')
 
-		if target.islink:
+		if target.is_link:
 			how = target.exists and 'good' or 'bad'
 			left.add(' -> ' + target.readlink, 'link', how)
 		else:
diff --git a/ranger/gui/widgets/titlebar.py b/ranger/gui/widgets/titlebar.py
index b815a07e..a949df05 100644
--- a/ranger/gui/widgets/titlebar.py
+++ b/ranger/gui/widgets/titlebar.py
@@ -118,7 +118,7 @@ class TitleBar(Widget):
 			bar.add('~/', 'directory', fixed=True)
 
 		for path in pathway:
-			if path.islink:
+			if path.is_link:
 				clr = 'link'
 			else:
 				clr = 'directory'