From a372843e15eeb972080dfa75572476feaccd66c6 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Dec 28 2016 17:02:12 +0000
Subject: Nuke shorturl hack, make it prettier


Signed-off-by: Ricky Elrod <ricky@elrod.me>

---

diff --git a/fpaste b/fpaste
index 27c6c12..17cf770 100755
--- a/fpaste
+++ b/fpaste
@@ -96,16 +96,9 @@ def get_shortened_url(long_url, password):
     except urllib.error.URLError:
         return False
 
-    # We know that short_url is always the third last line in the json output
-    # Iterating over each line is a bad idea. It'll break everytime it
-    # encounters a "short_url" string.
-    try:
-        result = json.loads(
-            '{' + f.readlines()[-3].decode() + '}')['short_url']
-    except ValueError as e:
-        return False
-    return result
-
+    return (json.loads(f.read().decode('utf-8'))
+                .get('result', {})
+                .get('short_url', False))
 
 def paste(text, options):
     """Send text to paste server and return the URL."""