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', 

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'<p><b>%s</b>: %s</p>'%exception
         msg += u'<p>Failed to perform <b>job</b>: '+description
         msg += u'<p>Detailed <b>traceback</b>:<pre>'
         msg += formatted_traceback + '</pre>'
         msg += '<p><b>Log:</b></p><pre>'
         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)
         
     

src/libprs500/manual/templates/macros.html

@@ -40,12 +40,12 @@
             <p style="font-size: 90%">Enter a module, class or function name.</p>
             {% endif %}
           {% endif %}
-          <div style="text-align: center; font: x-large monospace bold; color:yellow">
+          <div style="text-align: center; font: x-large monospace bold; color:yellow; margin-top: 50px;">
               <style type="text/css">
                   a.app:hover { text-decoration: none; color: red; }
               </style>
-              <a href="http://{{ project }}.kovidgoyal.net" class="app">
-                  <img alt="logo" src="_static/logo.png" /><br />{{ project }}
+              <a href="http://{{ project }}.kovidgoyal.net" class="app" style="border:none">
+                  <img alt="logo" src="_static/logo.png" style="border:none"/><br />{{ project }}
               </a>
           </div>
         </div>

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