1
0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-29 17:34:12 +02:00

python3 compatibility: import proper modules

Some modules (httplib, StringIO, ...) were renamed in python3. This
patch try to import the proper symbols from python3 and then fallback to
python2 in a case ImportError will appear.

There is one exception, python 2.7 got the io module with StringIO, but
it allow unicode arguments only. Therefor the old module is poked before
new one.
This commit is contained in:
Michal Vyskocil
2013-04-09 12:36:42 +02:00
committed by Adrian Schröter
parent c612e8d47e
commit 87d354e1a0
8 changed files with 91 additions and 46 deletions

View File

@@ -9,7 +9,11 @@ import os
import re
import sys
import shutil
import urlparse
try:
from urllib.parse import urlsplit
except ImportError:
#python 2.x
from urlparse import urlsplit
from tempfile import NamedTemporaryFile, mkdtemp
from osc.fetch import *
from osc.core import get_buildinfo, store_read_apiurl, store_read_project, store_read_package, meta_exists, quote_plus, get_buildconfig, is_package_dir
@@ -491,7 +495,7 @@ def main(apiurl, opts, argv):
opts.local_package = True
if opts.local_package:
pacname = os.path.splitext(build_descr)[0]
apihost = urlparse.urlsplit(apiurl)[1]
apihost = urlsplit(apiurl)[1]
if not build_root:
try:
build_root = config['build-root'] % {'repo': repo, 'arch': arch,