[gentoo-commits] proj/g-sorcery:master commit in: g_elpa/, tests/

[Jauhien Piatlicki]

commit:     1c6004894b1ecd4397791f09f5b9c0d4d7138809
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Tue Jul  2 14:50:11 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Tue Jul  2 14:50:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=1c600489

py2k: urljoin

---
 g_elpa/elpa_db.py     | 11 ++++++++---
 tests/test_elpa_db.py |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/g_elpa/elpa_db.py b/g_elpa/elpa_db.py
index 87e7095..51294ea 100644
--- a/g_elpa/elpa_db.py
+++ b/g_elpa/elpa_db.py
@@ -11,11 +11,16 @@
     :license: GPL-2, see LICENSE for more details.
 """
 
-import os, tempfile, urllib.parse
+import os
 
 import sexpdata
 
-from g_sorcery.compatibility import TemporaryDirectory
+from g_sorcery.compatibility import py2k, TemporaryDirectory
+
+if py2k:
+    from urlparse import urljoin
+else:
+    from urllib.parse import urljoin
 
 from g_sorcery.package_db import Package, PackageDB
 from g_sorcery.fileutils import wget
@@ -28,7 +33,7 @@ class ElpaDB(PackageDB):
     def generate_tree(self):
         tempdir = TemporaryDirectory()
         
-        ac_uri = urllib.parse.urljoin(self.repo_uri, 'archive-contents')
+        ac_uri = urljoin(self.repo_uri, 'archive-contents')
         if wget(ac_uri, tempdir.name):
             raise SyncError('sync failed: ' + self.repo_uri)
 

diff --git a/tests/test_elpa_db.py b/tests/test_elpa_db.py
index 874ee96..1ba99c7 100644
--- a/tests/test_elpa_db.py
+++ b/tests/test_elpa_db.py
@@ -11,7 +11,7 @@
     :license: GPL-2, see LICENSE for more details.
 """
 
-import http.server, os, tempfile, threading, unittest
+import os, unittest
 
 from g_elpa import elpa_db