From f922bcd1b011b644e213a71cfcabf526702090b6 Mon Sep 17 00:00:00 2001
From: Seblu <sebastien.luttringer@smartjog.com>
Date: Fri, 17 Jun 2011 19:08:44 +0200
Subject: [PATCH] cleaning import
---
bin/isimage | 2 +-
bin/isinstall | 2 +-
bin/isrepo | 2 +-
installsystems/database.py | 1 -
installsystems/tarball.py | 4 ----
5 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/bin/isimage b/bin/isimage
index ef829a5..611dc33 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 1ded51e..d36f469 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 73c23de..e7841e8 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 e5adffb..874a27a 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 b5a67fe..1c0fe0f 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):
--
GitLab