diff --git a/setup.py b/setup.py index 3f0414c35f..6d6891a0cc 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,7 @@ if __name__ == '__main__': For SVN access: svn co https://svn.kovidgoyal.net/code/%s - """%__appname__, + """%(APPNAME, APPNAME, APPNAME, APPNAME), license = 'GPL', classifiers = [ 'Development Status :: 4 - Beta', @@ -89,7 +89,7 @@ if __name__ == '__main__': 'Environment :: X11 Applications :: Qt', 'Intended Audience :: Developers', 'Intended Audience :: End Users/Desktop', - 'License :: OSI Approved :: GNU General Public License (GPL) v3', + 'License :: OSI Approved :: GNU General Public License (GPL)', 'Natural Language :: English', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', diff --git a/src/libprs500/gui2/main.py b/src/libprs500/gui2/main.py index 1f8ee81601..47988cdb7f 100644 --- a/src/libprs500/gui2/main.py +++ b/src/libprs500/gui2/main.py @@ -927,16 +927,16 @@ class Main(MainWindow, Ui_MainWindow): def conversion_job_exception(self, id, description, exception, formatted_traceback, log): print >>sys.stderr, 'Error in job:', description.encode('utf8') if log: - print >>sys.stderr, log.encode('utf8', 'ignore') + print >>sys.stderr, log.encode('utf8', 'ignore') if isinstance(log, unicode) else log print >>sys.stderr, exception - print >>sys.stderr, formatted_traceback.encode('utf8', 'ignore') + print >>sys.stderr, formatted_traceback.encode('utf8', 'ignore') if isinstance(formatted_traceback, unicode) else formatted_traceback msg = u'

%s: %s

'%exception msg += u'

Failed to perform job: '+description msg += u'

Detailed traceback:

'
         msg += formatted_traceback + '
' msg += '

Log:

'
         if log:
-            msg += log
+            msg += log.encode('utf8', 'ignore') if isinstance(log, unicode) else log.decode('utf8', 'ignore')
         ConversionErrorDialog(self, 'Conversion Error', msg, show=True)
         
     
diff --git a/src/libprs500/manual/templates/macros.html b/src/libprs500/manual/templates/macros.html
index 65e2dfa65b..6997a7fb12 100644
--- a/src/libprs500/manual/templates/macros.html
+++ b/src/libprs500/manual/templates/macros.html
@@ -40,12 +40,12 @@
             

Enter a module, class or function name.

{% endif %} {% endif %} -
+
- - logo
{{ project }} +
+ logo
{{ project }}
diff --git a/src/libprs500/web/feeds/recipes/wired.py b/src/libprs500/web/feeds/recipes/wired.py index 9bfbefa2bb..85983f90ff 100644 --- a/src/libprs500/web/feeds/recipes/wired.py +++ b/src/libprs500/web/feeds/recipes/wired.py @@ -13,6 +13,7 @@ class Wired(BasicNewsRecipe): description = 'Technology news' timefmt = ' [%Y%b%d %H%M]' no_stylesheets = True + html2lrf_options = ['--base-font-size', '12'] preprocess_regexps = [(re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in