From 28592b4cbfda15f8594b2765d031c777d31cf767 Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Sat, 13 May 2017 16:49:21 +0200 Subject: Make beinc_server.py beinc_poller.py beinc_weechat.py both Python2 and Python>=3.4 compatible --- beinc_poller.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'beinc_poller.py') diff --git a/beinc_poller.py b/beinc_poller.py index e84ad71..b4e798f 100755 --- a/beinc_poller.py +++ b/beinc_poller.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # -*- coding: utf-8 -*- # Blackmore's Enhanced IRC-Notification Collection (BEINC) v3.0 @@ -29,11 +29,21 @@ import ssl import sys import time -from urllib.parse import urlencode -from urllib.request import urlopen +PY2 = sys.version_info[0] == 2 +PY3 = sys.version_info[0] == 3 + +if PY3: + from urllib.parse import urlencode + from urllib.request import urlopen +else: + from urllib import urlencode + from urllib2 import urlopen try: - import notify2 as pynotify + if PY3: + import notify2 as pynotify + else: + import pynotify except ImportError as e: pynotify = None -- cgit v1.3