Add application support to run under python3.3
Fixed imports for urlparse and iostring libraries usage. This commit doesn't address updating dependent libraries to python 3 supported versions Moved to 'six' library for python3.3 support Closes-Blueprint: python33-support Change-Id: I624a5c3ef4d3e352574592e0248fe75201d7e780
This commit is contained in:
parent
700ed6150c
commit
8ff62baf28
@ -3,12 +3,9 @@ import paramiko
|
||||
import os
|
||||
from paramiko.dsskey import DSSKey
|
||||
from paramiko.rsakey import RSAKey
|
||||
from six import StringIO
|
||||
import stat
|
||||
import sys
|
||||
if sys.version < '3':
|
||||
from StringIO import StringIO
|
||||
else:
|
||||
from io import StringIO
|
||||
|
||||
TMP_KEY_PATH = "/tmp/joker_%s_%d"
|
||||
|
||||
|
@ -16,3 +16,4 @@ paramiko==1.11.0
|
||||
oslo.config==1.2.1
|
||||
requests==1.2.0
|
||||
PyYAML==3.10
|
||||
six==1.4.1
|
||||
|
@ -1,10 +1,5 @@
|
||||
import re
|
||||
import sys
|
||||
if sys.version < '3':
|
||||
from StringIO import StringIO
|
||||
else:
|
||||
from io import StringIO
|
||||
|
||||
from six import StringIO
|
||||
|
||||
from rubick.config_model import *
|
||||
from rubick.config_formats.common import *
|
||||
|
@ -10,10 +10,10 @@ from recordtype import recordtype
|
||||
from rubick.common import index, find, path_relative_to, all_subclasses
|
||||
from rubick.exceptions import ValidatorException
|
||||
from rubick.model import *
|
||||
from six import StringIO
|
||||
import shlex
|
||||
import stat
|
||||
import spur
|
||||
from StringIO import StringIO
|
||||
import tempfile
|
||||
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
from urlparse import urlparse
|
||||
from six.moves.urllib.parse import urlparse
|
||||
|
||||
from rubick.common import Inspection, Issue, find
|
||||
|
||||
|
7
webui.py
7
webui.py
@ -1,9 +1,3 @@
|
||||
import sys
|
||||
if sys.version < '3':
|
||||
from StringIO import StringIO
|
||||
else:
|
||||
from io import StringIO
|
||||
|
||||
from bson.objectid import ObjectId
|
||||
import os.path
|
||||
from flask import Flask, request, json, send_file
|
||||
@ -11,6 +5,7 @@ from flask_wtf import Form
|
||||
from paramiko.dsskey import DSSKey
|
||||
from paramiko.rsakey import RSAKey
|
||||
from paramiko.ssh_exception import SSHException
|
||||
from six import StringIO
|
||||
from wtforms import StringField, SelectMultipleField
|
||||
from wtforms.validators import DataRequired
|
||||
import wtforms_json
|
||||
|
Loading…
x
Reference in New Issue
Block a user