Browse Source

more special imports for python3 compatibility

main
Julien Iguchi-Cartigny 10 years ago
parent
commit
214fb59eba
1 changed files with 11 additions and 4 deletions
  1. +11
    -4
      wstools/Utility.py

+ 11
- 4
wstools/Utility.py View File

@@ -17,15 +17,20 @@ ident = "$Id$"


import sys import sys
import types import types
import httplib
import urllib

import socket import socket
import weakref import weakref
from os.path import isfile from os.path import isfile
from string import join, strip, split from string import join, strip, split
from UserDict import UserDict from UserDict import UserDict
from cStringIO import StringIO
from TimeoutSocket import TimeoutSocket, TimeoutError
import urllib

from .TimeoutSocket import TimeoutSocket, TimeoutError

try:
from io import StringIO
except ImportError:
from cStringIO import StringIO


try: try:
from urlparse import urlparse from urlparse import urlparse
@@ -37,6 +42,8 @@ try:
except ImportError: except ImportError:
from http.client import HTTPConnection, HTTPSConnection from http.client import HTTPConnection, HTTPSConnection




from exceptions import Exception from exceptions import Exception
try: try:
from ZSI import _get_idstr from ZSI import _get_idstr


Loading…
Cancel
Save