Merge

ikanobori · ikanobori · commit 0d5990c96dfd · 2010-08-01T16:40:48.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+v0.9.7.1
+--------
+
+A bugfix release. The fixed bugs are:
+
+* #128: bpython-gtk is broken
+* #134: crash when using pastebin and no active internet connection
+
 v0.9.7
 ------
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -35,6 +35,7 @@
 from glob import glob
 from itertools import takewhile
 from locale import getpreferredencoding
+from socket import error as SocketError
 from string import Template
 from urllib import quote as urlquote
 from xmlrpclib import ServerProxy, Error as XMLRPCError
@@ -713,7 +714,7 @@ def pastebin(self, s=None):
         self.interact.notify('Posting data to pastebin...')
         try:
             paste_id = pasteservice.pastes.newPaste('pycon', s)
-        except XMLRPCError, e:
+        except (SocketError, XMLRPCError), e:
             self.interact.notify('Upload failed: %s' % (str(e), ) )
             return
 
