X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/737cfb613092fd64855052f0dbf67365bbd366fa..794d6d442f9c150766568fd1626be46735829c85:/twitter/util.py

diff --git a/twitter/util.py b/twitter/util.py
index 7e4d6ab..7831939 100644
--- a/twitter/util.py
+++ b/twitter/util.py
@@ -12,6 +12,7 @@ import re
 import sys
 import textwrap
 import time
+import socket
 
 try:
     from html.entities import name2codepoint
@@ -117,17 +118,24 @@ def follow_redirects(link, sites= None):
     req = urllib2.Request(link)
     req.get_method = lambda : 'HEAD'
     try:
-        with contextlib.closing(opener.open(req)) as site:
+        with contextlib.closing(opener.open(req,timeout=1)) as site:
             return site.url
-    except (urllib2.HTTPError, urllib2.URLError):
+    except:
         return redirect_handler.last_url if redirect_handler.last_url else link
 
 def expand_line(line, sites):
     """Expand the links in the line for the given sites."""
-    l = line.strip()
-    msg_format, links = find_links(l)
-    args = tuple(follow_redirects(l, sites) for l in links)
-    return msg_format % args
+    try:
+        l = line.strip()
+        msg_format, links = find_links(l)
+        args = tuple(follow_redirects(l, sites) for l in links)
+        line = msg_format % args
+    except Exception as e:
+        try:
+            err("expanding line %s failed due to %s" % (line, unicode(e)))
+        except:
+            pass
+    return line
 
 def parse_host_list(list_of_hosts):
     """Parse the comma separated list of hosts."""
@@ -136,7 +144,7 @@ def parse_host_list(list_of_hosts):
     return p
 
 
-def align_text(text, left_margin=16, max_width=80):
+def align_text(text, left_margin=17, max_width=160):
     lines = []
     for line in text.split('\n'):
         temp_lines = textwrap.wrap(line, max_width - left_margin)