D3481.1774852132.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D3481.1774852132.diff
View Options

	diff --git a/pykolab/cli/__init__.py b/pykolab/cli/__init__.py
	--- a/pykolab/cli/__init__.py
	+++ b/pykolab/cli/__init__.py
	@@ -16,7 +16,11 @@
	# You should have received a copy of the GNU General Public License
	# along with this program. If not, see <http://www.gnu.org/licenses/>.
	#
	-
	+try:
	+ # Python 2: "reload" is built-in
	+ reload
	+except NameError:
	+ from importlib import reload
	import ldap
	import ldif
	import logging
	diff --git a/pykolab/wap_client/__init__.py b/pykolab/wap_client/__init__.py
	--- a/pykolab/wap_client/__init__.py
	+++ b/pykolab/wap_client/__init__.py
	@@ -1,6 +1,9 @@

	import json
	-import httplib
	+try:
	+ import httplib
	+except ImportError:
	+ import http.client as httplib
	import urllib
	import sys
	try:
	diff --git a/wallace/__init__.py b/wallace/__init__.py
	--- a/wallace/__init__.py
	+++ b/wallace/__init__.py
	@@ -31,7 +31,10 @@
	import struct
	import sys
	import tempfile
	-from threading import _Timer
	+try:
	+ from threading import _Timer
	+except:
	+ from threading import Timer as _Timer
	import time

	import pykolab