colorschemes: use "Scheme" as the default class name for colorschemes

2 files changed, 10 insertions, 10 deletions

diff --git a/ranger/colorschemes/jungle.py b/ranger/colorschemes/jungle.py
index e6c3307f..376091c0 100644
--- a/ranger/colorschemes/jungle.py
+++ b/ranger/colorschemes/jungle.py
@@ -15,12 +15,11 @@
 
 from ranger.gui.colorscheme import ColorScheme
 from ranger.gui.color import *
+from ranger.colorschemes.default import Default
 
-from ranger.colorschemes.default import Default as SubClass
-
-class Default(SubClass):
+class Scheme(Default):
 	def use(self, context):
-		fg, bg, attr = SubClass.use(self, context)
+		fg, bg, attr = Default.use(self, context)
 
 		if context.directory and not context.marked:
 			fg = green
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index c01e5796..b549bd20 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -79,14 +79,15 @@ class SettingsAware(object):
 			options.colorscheme = options.colorscheme()
 
 		elif ismodule(options.colorscheme):
-			if hasattr(options.colorscheme, 'Default') \
-			and isclass(options.colorscheme.Default) \
-			and issubclass(options.colorscheme.Default, ColorScheme):
-				options.colorscheme = options.colorscheme.Default()
+			def is_scheme(x):
+				return isclass(x) and issubclass(x, ColorScheme)
+
+			if hasattr(options.colorscheme, 'Scheme') \
+					and is_scheme(options.colorscheme.Scheme):
+				options.colorscheme = options.colorscheme.Scheme()
 			else:
 				for name, var in options.colorscheme.__dict__.items():
-					if var != ColorScheme and isclass(var) \
-					and issubclass(var, ColorScheme):
+					if var != ColorScheme and is_scheme(var):
 						options.colorscheme = var()
 						break
 				else: