changeset 6104:68f8bea727e5

remove usage of MoinMoin.support.tarfile
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 06 Sep 2016 01:10:13 +0200
parents 500f68d3e2fd
children 0f6287e5b3ff
files MoinMoin/_tests/maketestwiki.py MoinMoin/action/AttachFile.py MoinMoin/action/backup.py MoinMoin/script/migration/1089999.py
diffstat 4 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/_tests/maketestwiki.py	Tue Sep 06 01:00:25 2016 +0200
+++ b/MoinMoin/_tests/maketestwiki.py	Tue Sep 06 01:10:13 2016 +0200
@@ -11,12 +11,11 @@
 """
 
 import os, sys, shutil, errno
+import tarfile
 
 filename = globals().get("__file__") or sys.argv[0]
 moinpath = os.path.abspath(os.path.join(os.path.dirname(filename), os.pardir, os.pardir))
 
-from MoinMoin.support import tarfile
-
 WIKI = os.path.abspath(os.path.join(moinpath, 'tests', 'wiki'))
 SHARE = os.path.abspath(os.path.join(moinpath, 'wiki'))
 
--- a/MoinMoin/action/AttachFile.py	Tue Sep 06 01:00:25 2016 +0200
+++ b/MoinMoin/action/AttachFile.py	Tue Sep 06 01:10:13 2016 +0200
@@ -29,6 +29,7 @@
 
 import os, time, zipfile, errno, datetime
 from StringIO import StringIO
+import tarfile
 
 from werkzeug import http_date
 
@@ -44,7 +45,6 @@
 from MoinMoin.util import filesys, timefuncs
 from MoinMoin.security.textcha import TextCha
 from MoinMoin.events import FileAttachedEvent, FileRemovedEvent, send_event
-from MoinMoin.support import tarfile
 
 action_name = __name__.split('.')[-1]
 
--- a/MoinMoin/action/backup.py	Tue Sep 06 01:00:25 2016 +0200
+++ b/MoinMoin/action/backup.py	Tue Sep 06 01:10:13 2016 +0200
@@ -17,9 +17,9 @@
 """
 
 import os, re, time
+import tarfile
 
 from MoinMoin import wikiutil
-from MoinMoin.support import tarfile
 
 
 def addFiles(path, tar, exclude_func):
--- a/MoinMoin/script/migration/1089999.py	Tue Sep 06 01:00:25 2016 +0200
+++ b/MoinMoin/script/migration/1089999.py	Tue Sep 06 01:10:13 2016 +0200
@@ -14,8 +14,8 @@
 """
 
 import os, errno
+import tarfile
 
-from MoinMoin.support import tarfile
 from MoinMoin.action.AttachFile import getAttachDir