cleaning import

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
 

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

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

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

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):