X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fsocks.py;h=fece280626606453f378d44a533bb167e656a30f;hb=83442966194640d9bc00e7f3086aa5e8b25c4ae3;hp=63d19b3a5214221afa71a6d43bde36a39c13cd4b;hpb=a94e7f4a0ca333aabf08adb1c329b4b5b8a5d897;p=youtube-dl.git

diff --git a/youtube_dl/socks.py b/youtube_dl/socks.py
index 63d19b3a5..fece28062 100644
--- a/youtube_dl/socks.py
+++ b/youtube_dl/socks.py
@@ -60,7 +60,7 @@ class ProxyError(IOError):
 
     def __init__(self, code=None, msg=None):
         if code is not None and msg is None:
-            msg = self.CODES.get(code) and 'unknown error'
+            msg = self.CODES.get(code) or 'unknown error'
         super(ProxyError, self).__init__(code, msg)