diff --git a/bin/isimage b/bin/isimage index ef829a5df78d8c8ffab2496a319a7ac24703015a..611dc3328a66096976518f431a5454c3e6040a07 100755 --- a/bin/isimage +++ b/bin/isimage @@ -9,8 +9,8 @@ InstallSystems Image Manipulation Tool import os import time import datetime -import argparse import installsystems +import installsystems.argparse as argparse # To remove when default to python 2.7 from installsystems.printer import * from installsystems.image import SourceImage diff --git a/bin/isinstall b/bin/isinstall index 1ded51e28a135181419a729f289d8122ecf21823..d36f469af69df23a577a9b63a22a8b545495ea5f 100755 --- a/bin/isinstall +++ b/bin/isinstall @@ -9,9 +9,9 @@ InstallSystems Installation Tool import os import time import datetime -import argparse import installsystems import installsystems.tools as istools +import installsystems.argparse as argparse # To remove when default to python 2.7 from installsystems.printer import * from installsystems.repository import RepositoryManager, RepositoryConfig from installsystems.image import PackageImage diff --git a/bin/isrepo b/bin/isrepo index 73c23de4963e3de054599afce9dfb3e7cb1076d3..e7841e8e5caf74ff86bab14ea8e1c08df7b098be 100755 --- a/bin/isrepo +++ b/bin/isrepo @@ -7,8 +7,8 @@ InstallSystems Repository Manipulation Tool ''' import os -import argparse import installsystems +import installsystems.argparse as argparse # To remove when default to python 2.7 from installsystems.printer import * from installsystems.repository import Repository, RepositoryConfig from installsystems.image import PackageImage diff --git a/installsystems/database.py b/installsystems/database.py index e5adffbffa769d3a342484b5772b83302dedfaa1..874a27a46367108775a472a89d00ccfa9406d324 100644 --- a/installsystems/database.py +++ b/installsystems/database.py @@ -9,7 +9,6 @@ Database stuff import json import os import shutil -import tarfile import cStringIO import sqlite3 import installsystems.tools as istools diff --git a/installsystems/tarball.py b/installsystems/tarball.py index b5a67fe4177db828ad86f39e3f6346a8c75ed204..1c0fe0ff4dedaf9ec30216000ba42a943420dfb0 100644 --- a/installsystems/tarball.py +++ b/installsystems/tarball.py @@ -11,10 +11,6 @@ import time import tarfile import StringIO import re -# Use tarfile from python 2.7 which include filter parameter in add method. -# This is really needed to filter an modify tarball content on the fly. -# Should be removed when python 2.7 will be the minimum python version -from installsystems import tarfile class Tarball(tarfile.TarFile): def add_str(self, name, content, ftype, mode):