Remove target "make uninstall".

[simgrid.git] / tools / appveyor-irc-notify.py

diff --git a/tools/appveyor-irc-notify.py b/tools/appveyor-irc-notify.py
index a83bbaf..3a84ebb 100644 (file)
--- a/tools/appveyor-irc-notify.py
+++ b/tools/appveyor-irc-notify.py
@@ -33,7 +33,7 @@ expanded automatically, replaced with a corresponding Appveyor environment varia
 value. se commas to delineate multiple messages.
 
 Modified by Martin Quinson on June 2018:
-    
+
  - Use OFTC instead of Freenode
 
 Example:
@@ -62,12 +62,16 @@ in Appveyor's YAML:
 
 """
 
-import os, random, socket, ssl, sys, time
+import random
+import socket
+import ssl
+import sys
+import time
 
 
 def appveyor_vars():
     """
-    Return a dict of key value carfted from appveyor environment variables.
+    Return a dict of key value crafted from appveyor environment variables.
     """
     from os import environ
 
@@ -93,7 +97,7 @@ def appveyor_vars():
     build_url = '{appveyor_url}/project/{account_name}/{project_slug}/build/{build_version}'.format(**locals())
     commit_url = 'https://{repo_provider}.com/{repo_name}/commit/{commit}'.format(**locals())
 
-    vars = dict(
+    apvy_vars = dict(
         appveyor_url=appveyor_url,
         account_name=account_name,
         project_name=project_name,
@@ -125,7 +129,7 @@ def appveyor_vars():
         underline='\x1f',
         plain='\x0f',
     )
-    return vars
+    return apvy_vars
 
 
 if __name__ == '__main__':
@@ -142,7 +146,7 @@ if __name__ == '__main__':
 
     try:
         # establish connection
-        irc_sock = ssl.wrap_socket(socket.socket(socket.AF_INET, socket.SOCK_STREAM))
+        irc_sock = ssl.wrap_socket(socket.socket(socket.AF_INET, socket.SOCK_STREAM), ssl_version=ssl.PROTOCOL_TLS)
         irc_sock.connect((socket.gethostbyname('irc.oftc.net'), 6697))
         irc_sock.send('NICK {0}\r\nUSER {0} * 0 :{0}\r\n'.format(irc_username).encode('utf_8'))
         irc_file = irc_sock.makefile()
@@ -170,7 +174,7 @@ if __name__ == '__main__':
                 # leave the channel
                 irc_sock.send('PART #{}\r\n'.format(channel).encode('utf_8'))
                 sys.exit()
-    except:
+    except Exception:
         e = sys.exc_info()[0]
         print(e)
         sys.exit()