Use pygrader.ENCODING when loading ConfigParser files.

diff --git a/bin/pg.py b/bin/pg.py
index dd8215eabe5888866013de5763a076a27d2e2329..fd7586cfeb4bfbb4512d76902b2345fd2923fe30 100755 (executable)
--- a/bin/pg.py
+++ b/bin/pg.py
@@ -31,6 +31,7 @@ import sys as _sys
 import pgp_mime as _pgp_mime
 
 from pygrader import __version__
+from pygrader import ENCODING as _ENCODING
 from pygrader import LOG as _LOG
 from pygrader import color as _color
 from pygrader.email import test_smtp as _test_smtp
@@ -180,10 +181,12 @@ if __name__ == '__main__':
         _pgp_mime.LOG.addHandler(syslog)
     _color.USE_COLOR = args.color
 
+    _ENCODING = args.encoding
+
     config = _configparser.ConfigParser()
     config.read([
             _os_path.expanduser(_os_path.join('~', '.config', 'smtplib.conf')),
-            ])
+            ], encoding=_ENCODING)
 
     func_args = _inspect.getargspec(args.func).args
     kwargs = {}

diff --git a/pygrader/storage.py b/pygrader/storage.py
index d5e2e38bf941c64c78a94e1f69a422b759cb586e..892f18e788634eef61377fde8863edc24bb973f0 100644 (file)
--- a/pygrader/storage.py
+++ b/pygrader/storage.py
@@ -58,7 +58,7 @@ def load_course(basedir):
     """
     _LOG.debug('loading course from {}'.format(basedir))
     config = _configparser.ConfigParser()
-    config.read([_os_path.join(basedir, 'course.conf')])
+    config.read([_os_path.join(basedir, 'course.conf')], encoding=_ENCODING)
     name = config.get('course', 'name')
     names = {'robot': [config.get('course', 'robot').strip()]}
     for option in ['assignments', 'professors', 'assistants', 'students']: