Remove hipster f-strings so lower python version is supported

Author: einarf

README.rst

@@ -35,22 +35,15 @@ worst thing that can happen is that we or you might learn something.
 This is supposed to be a fun project.
 
 Also check out the `TODO list <TODO.md>`__. Take a stab on what of the
-features or documentation or suggest new entires.
+features or documentation or suggest new entries.
 
 Running the damned thing
 ------------------------
 
-- First of all install the latest python 3.6 package (or later) from python.org
+- First of all make sure you have python3 installed
 - Install GLFW binaries for your OS from your favorite package manger or download it from http://www.glfw.org/
 - If you want working music you will also need to install SDL
-- Make a virtualenv and install the package: ``pip install demosys-py``.
-- Run the default test effect: ``demosys_test runeffect demosys_test.cube``
 
-
-Running from source
--------------------
-
-Again, make sure you have python 3.6 or later before proceeding.
 Let's clone the testdemo project.
 
 ::
@@ -143,7 +136,8 @@ There you go.
   look at shaders in the testdemo_.
 - You currently define vertex,
   fragment and geometry shader in one glsl file separated by
-  preprocessors. - Effects not defined in the ``settings.py`` module will not run.
+  preprocessors.
+- Effects not defined in the ``settings.py`` module will not run.
 
 That should give you an idea..
 
@@ -186,8 +180,8 @@ Some babble about the current state of the project:
   This will return a lazy object that will be populated after the loading
   stage is done.
 - Resources shared between effects can be put outside effect packages
-  inside your project directory. For example in ``testproject/resources/shaders``
-  and ``testproject/resources/textures``. Make sure you add those paths in the
+  inside your project directory. For example in ``testdemo/resources/shaders``
+  and ``testdemo/resources/textures``. Make sure you add those paths in the
   settings file.
 - We don't have any scene/mesh loaders. You can hack something in yourself
   for now or just stick to or extend the ``geometry`` module. - We try to

demosys/conf/settingsfile.py

@@ -16,15 +16,15 @@ def create(settings):
             data += "%s = {\n%s\n}\n\n" % (name, value)
         elif isinstance(value, tuple):
             value = ",\n".join("    {}".format(to_s(v)) for v in value)
-            data += f"{name} = (\n{value})\n\n"
+            data += "{} = (\n{})\n\n".format(name, value)
         elif value is None:
-            data += f"{name} = {value}\n\n"
+            data += "{} = {}\n\n".format(name, value)
 
     return data
 
 
 def to_s(t):
     if isinstance(t, str):
-        return f'"{t}"'
+        return '"{}"'.format(t)
     else:
         return str(t)

demosys/core/management/__init__.py

@@ -20,7 +20,7 @@ def local_command_dir():
 
 
 def load_command_class(app_name, name):
-    module = import_module(f'{app_name}.management.commands.{name}')
+    module = import_module('{}.management.commands.{}'.format(app_name, name))
     return module.Command()
 
 
@@ -41,4 +41,4 @@ def execute_from_command_line(argv=None):
     else:
         print("Available commands:")
         for c in commands:
-            print(f" - {c}")
+            print(" - {}".format(c))

demosys/core/management/base.py

@@ -52,7 +52,7 @@ def validate_name(self, name):
 
         # Can the name be used as an identifier in python (module or package name)
         if not name.isidentifier():
-            raise ValueError(f"{name} is not a valid identifier")
+            raise ValueError("{} is not a valid identifier".format(name))
 
     def try_import(self, name):
         """Attemt to import the name"""
@@ -61,4 +61,4 @@ def try_import(self, name):
         except ImportError:
             pass
         else:
-            raise ValueError(f"{name} conflicts with an existing python module")
+            raise ValueError("{} conflicts with an existing python module".format(name))

demosys/core/management/commands/createeffect.py

@@ -19,7 +19,7 @@ def handle(self, *args, **options):
 
         # Make sure we don't mess with existing directories
         if os.path.exists(name):
-            print(f"Directory {name} already exist. Aborting.")
+            print("Directory {} already exist. Aborting.".format(name))
             return
 
         os.mkdir(name)

demosys/core/management/commands/createproject.py

@@ -19,7 +19,7 @@ def handle(self, *args, **options):
 
         # Make sure we don't mess with existing directories
         if os.path.exists(name):
-            print(f"Directory {name} already exist. Aborting.")
+            print("Directory {} already exist. Aborting.".format(name))
             return
 
         manage_file = 'manage.py'

demosys/core/shaderfiles/finders.py

@@ -44,5 +44,5 @@ def get_finders():
 def get_finder(import_path):
     Finder = import_string(import_path)
     if not issubclass(Finder, finders.FileSystemFinder):
-        raise ImproperlyConfigured(f'Finder {import_path} is not a subclass of core.finders.FileSystemFinder')
+        raise ImproperlyConfigured('Finder {} is not a subclass of core.finders.FileSystemFinder'.format(import_path))
     return Finder()

demosys/core/texturefiles/finders.py

@@ -44,5 +44,5 @@ def get_finders():
 def get_finder(import_path):
     Finder = import_string(import_path)
     if not issubclass(Finder, finders.FileSystemFinder):
-        raise ImproperlyConfigured(f'Finder {import_path} is not a subclass of core.finders.FileSystemFinder')
+        raise ImproperlyConfigured('Finder {} is not a subclass of core.finders.FileSystemFinder'.format(import_path))
     return Finder()

demosys/effects/registry.py

@@ -35,13 +35,13 @@ def get_dirs(self):
     def polulate(self, effect_list):
         """Find all effects"""
         for effect in effect_list:
-            name = f'{effect}.{EFFECT_MODULE}'
+            name = '{}.{}'.format(effect, EFFECT_MODULE)
             module, cls = self.get_effect_cls(name)
             if cls:
                 cls.name = effect
                 self.effects[module.__name__] = EffectConfig(module=module, cls=cls)
             else:
-                raise EffectError(f"Effect '{effect}' has no effect class")
+                raise EffectError("Effect '{}' has no effect class".format(effect))
 
     def get_effect_cls(self, module_name):
         """Find and return an effect class in a module

demosys/resources/shaders.py

@@ -31,7 +31,7 @@ def load(self):
                     shader.prepare()
                     break
             else:
-                raise ImproperlyConfigured(f"Cannot find shader {name}")
+                raise ImproperlyConfigured("Cannot find shader {}".format(name))
 
 
 shaders = Shaders()

demosys/resources/textures.py

@@ -32,7 +32,7 @@ def load(self):
                     texture.set_image(image)
                     break
             else:
-                raise ImproperlyConfigured(f"Cannot find texture {name}")
+                raise ImproperlyConfigured("Cannot find texture {name}")
 
 
 textures = Textures()

demosys/view/controller.py

@@ -43,7 +43,7 @@ def run(manager=None):
 
     # Load resources
     num_resources = resources.count()
-    print(f"Loading {num_resources } resources")
+    print("Loading {} resources".format(num_resources))
     resources.load()
 
     # Post-Load actions for effects

setup.py

@@ -20,6 +20,7 @@
         'Intended Audience :: Developers',
         'Topic :: Multimedia :: Graphics',
         'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
     ],