Merged in bugfix/HTTPASTE-44 (pull request #42)

Bugfix/HTTPASTE-44

src/httpaste/__init__.py

@@ -118,7 +118,7 @@ SEE ALSO
     Sources       <https://bitbucket.org/victorykit/httpaste>
 
     Host          (HTTP)  <http://httpaste.it>
-                  (Onion) <http://http://paste77ubkwxy4fqezffsmthxdh3xerwi72tlsw2mch7ecjhw2xn7iyd.onion>
+                  (Onion) <http://paste77ubkwxy4fqezffsmthxdh3xerwi72tlsw2mch7ecjhw2xn7iyd.onion>
 
 NOTES
 

src/httpaste/controller/paste/__init__.py

@@ -100,11 +100,13 @@ def get(**kwargs):
         else:
             paste_model.remove(pid, backend.paste)
 
+    if encoding is not None:
+        data = data.decode(encoding)
+
     if syntax is not None:
         data = highlight(data, str(syntax), formatter, linenos)
 
-    if encoding is not None:
-        data = data.decode(encoding)
+
 
     return ConnexionResponse(
         status_code=200,