From 61d2e7bdabfdac94c533265941d4909537676f4b Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 06 Jul 2016 21:07:03 +0000
Subject: [PATCH] Fixes in python to allow Python 2.7 execution
---
python/trisurf/__init__.py | 0
python/trisurf/WebTrisurf.py | 7 +++++--
python/trisurf/tsmgr.py | 15 ++++++++++-----
python/networkedExample.py | 1 -
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/python/networkedExample.py b/python/networkedExample.py
index 931d7ab..74c0a04 100755
--- a/python/networkedExample.py
+++ b/python/networkedExample.py
@@ -4,7 +4,6 @@
-
#Ok... Configure your keys:
#ssh-keygen
#and copy them to all the remote hosts
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):
diff --git a/python/trisurf/__init__.py b/python/trisurf/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/python/trisurf/__init__.py
diff --git a/python/trisurf/tsmgr.py b/python/trisurf/tsmgr.py
index caff785..258f4c9 100644
--- a/python/trisurf/tsmgr.py
+++ b/python/trisurf/tsmgr.py
@@ -1,7 +1,7 @@
import argparse
import paramiko
from . import Remote
-from trisurf import trisurf
+from . import trisurf
import socket
import sys
import tabulate
@@ -9,9 +9,11 @@
import psutil
#import http.server
#import socketserver
-from urllib.parse import urlparse
-
-from . import WebTrisurf
+if sys.version_info>=(3,0):
+ from urllib.parse import urlparse
+ from . import WebTrisurf
+else:
+ from urlparse import urlparse
#import io
@@ -169,7 +171,10 @@
def start_web_server(args,host):
print('Server listening on port {}'.format(args['web_server'][0]))
- WebTrisurf.WebServer(port=args['web_server'][0])
+ if sys.version_info>=(3,0):
+ WebTrisurf.WebServer(port=args['web_server'][0])
+ else:
+ print("Cannot start WebServer in python 2.7")
exit(0)
def perform_action(args,host):
--
Gitblit v1.9.3