Moar unicode fixes

rophako/app.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import unicode_literals
 
 """Flask app for Rophako."""
 

rophako/jsondb.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """JSON flat file database system."""
 

rophako/log.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Debug and logging functions."""
 

rophako/model/blog.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Blog models."""
 

rophako/model/comment.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Commenting models."""
 

rophako/model/emoticons.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Emoticon models."""
 

rophako/model/photo.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Photo album models."""
 

rophako/model/tracking.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Visitor tracking models."""
 

rophako/model/user.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """User account models."""
 

rophako/model/wiki.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Wiki models."""
 

rophako/modules/account/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Endpoints for user login and out."""
 

rophako/modules/admin/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Endpoints for admin functions."""
 

rophako/modules/blog/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Endpoints for the web blog."""
 

rophako/modules/contact/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Endpoints for contacting the site owner."""
 

rophako/modules/emoticons/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Endpoints for the commenting subsystem."""
 

rophako/modules/photo/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Endpoints for the photo albums."""
 

rophako/modules/tracking/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Endpoints for visitor tracking functions."""
 

rophako/modules/wiki/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 """Endpoints for the wiki."""
 

rophako/plugin.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import unicode_literals
 
 """Dynamic CMS plugin loader."""
 

rophako/settings.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 import os
 import datetime

rophako/utils.py

@@ -14,6 +14,7 @@ import markdown
 import json
 import urlparse
 import traceback
+import socket
 
 from rophako.log import logger
 from rophako.settings import Config
@@ -190,10 +191,13 @@ def send_email(to, subject, message, sender=None, reply_to=None):
             headers.append("Subject: {}".format(subject))
 
             # Prepare the mail for transport.
-            server = smtplib.SMTP(Config.mail.server, Config.mail.port)
+            try:
-            msg = "\n".join(headers) + "\n\n" + message
+                server = smtplib.SMTP(Config.mail.server, Config.mail.port)
-            server.sendmail(sender, email, msg)
+                msg = "\n".join(headers) + "\n\n" + message
-            server.quit()
+                server.sendmail(sender, email, msg)
+                server.quit()
+            except socket.error:
+                pass
 
 
 def handle_exception(error):

rophako/www/layout.html

@@ -54,15 +54,6 @@
 
     {% block content %}{% endblock %}
 
-    <hr>
-    <p class="right">
-        <strong>Visitor Information:</strong><br>
-        Unique Visitors: {{ tracking["unique_today"] }} today/{{ tracking["unique_total"] }} total<br>
-        Page Hits: {{ tracking["hits_today"] }} today/{{ tracking["hits_total"] }} total<br>
-        <a href="{{ url_for('tracking.visitors') }}">Visitor Details</a> |
-        <a href="{{ url_for('tracking.referrers') }}">Referring URLs</a>
-    </p>
-
     <footer>
         <div>
             &copy; 2014 Noah Petherbridge. Web design released along with the Rophako CMS

scripts/orphaned-photos.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import unicode_literals
 
 """Locate any orphaned photos.
 
@@ -34,4 +35,4 @@ def main():
             print "Orphan:", fname
 
 if __name__ == "__main__":
-    main()
+    main()

scripts/siikir-blog-migrate.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import unicode_literals
 
 """Migrate blog database files from a PerlSiikir site to Rophako.
 
@@ -117,4 +118,4 @@ def json_get(document):
 
 
 if __name__ == "__main__":
-    main()
+    main()