| 1 |
commit: ff09e8f87f97a1a3ba407c8c9bea5150bdc3cb3d |
| 2 |
Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 2 14:25:11 2013 +0000 |
| 4 |
Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Jul 2 14:25:11 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=ff09e8f8 |
| 7 |
|
| 8 |
py2: TemporaryDirectory |
| 9 |
|
| 10 |
--- |
| 11 |
g_elpa/elpa_db.py | 4 +++- |
| 12 |
g_sorcery/package_db.py | 8 +++++--- |
| 13 |
2 files changed, 8 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/g_elpa/elpa_db.py b/g_elpa/elpa_db.py |
| 16 |
index b2859dd..87e7095 100644 |
| 17 |
--- a/g_elpa/elpa_db.py |
| 18 |
+++ b/g_elpa/elpa_db.py |
| 19 |
@@ -15,6 +15,8 @@ import os, tempfile, urllib.parse |
| 20 |
|
| 21 |
import sexpdata |
| 22 |
|
| 23 |
+from g_sorcery.compatibility import TemporaryDirectory |
| 24 |
+ |
| 25 |
from g_sorcery.package_db import Package, PackageDB |
| 26 |
from g_sorcery.fileutils import wget |
| 27 |
from g_sorcery.exceptions import SyncError |
| 28 |
@@ -24,7 +26,7 @@ class ElpaDB(PackageDB): |
| 29 |
super(ElpaDB, self).__init__(directory, repo_uri, db_uri) |
| 30 |
|
| 31 |
def generate_tree(self): |
| 32 |
- tempdir = tempfile.TemporaryDirectory() |
| 33 |
+ tempdir = TemporaryDirectory() |
| 34 |
|
| 35 |
ac_uri = urllib.parse.urljoin(self.repo_uri, 'archive-contents') |
| 36 |
if wget(ac_uri, tempdir.name): |
| 37 |
|
| 38 |
diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py |
| 39 |
index 032c118..763ea30 100644 |
| 40 |
--- a/g_sorcery/package_db.py |
| 41 |
+++ b/g_sorcery/package_db.py |
| 42 |
@@ -11,6 +11,8 @@ |
| 43 |
:license: GPL-2, see LICENSE for more details. |
| 44 |
""" |
| 45 |
|
| 46 |
+from .compatibility import TemporaryDirectory |
| 47 |
+ |
| 48 |
from .exceptions import DBStructureError, IntegrityError, \ |
| 49 |
InvalidKeyError, SyncError |
| 50 |
|
| 51 |
@@ -80,16 +82,16 @@ class PackageDB(object): |
| 52 |
self.db_uri = db_uri |
| 53 |
self.clean() |
| 54 |
real_db_uri = self.get_real_db_uri() |
| 55 |
- download_dir = tempfile.TemporaryDirectory() |
| 56 |
+ download_dir = TemporaryDirectory() |
| 57 |
if wget(real_db_uri, download_dir.name): |
| 58 |
raise SyncError('sync failed: ' + real_db_uri) |
| 59 |
|
| 60 |
- temp_dir = tempfile.TemporaryDirectory() |
| 61 |
+ temp_dir = TemporaryDirectory() |
| 62 |
for f_name in glob.iglob(os.path.join(download_dir.name, '*.tar.gz')): |
| 63 |
with tarfile.open(f_name) as f: |
| 64 |
f.extractall(temp_dir.name) |
| 65 |
|
| 66 |
- tempdb_dir = tempfile.TemporaryDirectory() |
| 67 |
+ tempdb_dir = TemporaryDirectory() |
| 68 |
tempdb = PackageDB(tempdb_dir.name) |
| 69 |
|
| 70 |
for d_name in os.listdir(temp_dir.name): |
Archives