From c2c6364dc7d23f21dabd2179e775e93ba4eeb252 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:45:07 +0000
Subject: [PATCH] Merging again because I was merging in detached state

---
 python/trisurf/WebTrisurf.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/python/trisurf/WebTrisurf.py b/python/trisurf/WebTrisurf.py
index 0ececbc..4b36ec9 100644
--- a/python/trisurf/WebTrisurf.py
+++ b/python/trisurf/WebTrisurf.py
@@ -1,8 +1,11 @@
 import subprocess
-from urllib.parse import urlparse
+import sys, os
+if sys.version_info>=(3,0):
+	from urllib.parse import urlparse
+else:
+	from urlparse import urlparse
 import http.server
 import socketserver
-import sys, os
 
 #Web server
 class TsWEB(http.server.BaseHTTPRequestHandler):

--
Gitblit v1.9.3