| 1 |
commit: 9b8b993e94e828c6d93efdd32b2c646bd02f17da |
| 2 |
Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 2 12:36:24 2013 +0000 |
| 4 |
Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Jul 2 12:36:24 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=9b8b993e |
| 7 |
|
| 8 |
py2: super calls |
| 9 |
|
| 10 |
--- |
| 11 |
g_elpa/elpa_db.py | 2 +- |
| 12 |
g_sorcery/compatibility.py | 7 ++++++- |
| 13 |
g_sorcery/ebuild.py | 2 +- |
| 14 |
tests/server.py | 2 +- |
| 15 |
tests/test_backend.py | 2 +- |
| 16 |
tests/test_ebuild.py | 4 ++-- |
| 17 |
tests/test_fileutils.py | 2 +- |
| 18 |
tests/test_g_sorcery.py | 2 +- |
| 19 |
tests/test_metadata.py | 4 ++-- |
| 20 |
tests/test_package_db.py | 7 ++----- |
| 21 |
10 files changed, 18 insertions(+), 16 deletions(-) |
| 22 |
|
| 23 |
diff --git a/g_elpa/elpa_db.py b/g_elpa/elpa_db.py |
| 24 |
index 04676b5..b2859dd 100644 |
| 25 |
--- a/g_elpa/elpa_db.py |
| 26 |
+++ b/g_elpa/elpa_db.py |
| 27 |
@@ -21,7 +21,7 @@ from g_sorcery.exceptions import SyncError |
| 28 |
|
| 29 |
class ElpaDB(PackageDB): |
| 30 |
def __init__(self, directory, repo_uri="", db_uri=""): |
| 31 |
- super().__init__(directory, repo_uri, db_uri) |
| 32 |
+ super(ElpaDB, self).__init__(directory, repo_uri, db_uri) |
| 33 |
|
| 34 |
def generate_tree(self): |
| 35 |
tempdir = tempfile.TemporaryDirectory() |
| 36 |
|
| 37 |
diff --git a/g_sorcery/compatibility.py b/g_sorcery/compatibility.py |
| 38 |
index ea6f3bf..5491d72 100644 |
| 39 |
--- a/g_sorcery/compatibility.py |
| 40 |
+++ b/g_sorcery/compatibility.py |
| 41 |
@@ -16,6 +16,11 @@ import sys |
| 42 |
py2k = sys.version_info < (3, 0) |
| 43 |
|
| 44 |
if py2k: |
| 45 |
- pass |
| 46 |
+ class TemporaryDirectory(): |
| 47 |
+ def __init__(self): |
| 48 |
+ pass |
| 49 |
+ |
| 50 |
+ def __del__(self): |
| 51 |
+ pass |
| 52 |
else: |
| 53 |
from tempfile import TemporaryDirectory |
| 54 |
|
| 55 |
diff --git a/g_sorcery/ebuild.py b/g_sorcery/ebuild.py |
| 56 |
index ea27afe..f36dc42 100644 |
| 57 |
--- a/g_sorcery/ebuild.py |
| 58 |
+++ b/g_sorcery/ebuild.py |
| 59 |
@@ -41,7 +41,7 @@ class EbuildGenerator: |
| 60 |
|
| 61 |
class EbuildGeneratorFromFile(EbuildGenerator): |
| 62 |
def __init__(self, db): |
| 63 |
- super().__init__(db) |
| 64 |
+ super(EbuildGeneratorFromFile, self).__init__(db) |
| 65 |
|
| 66 |
def get_template(self, package, description): |
| 67 |
name = self.get_template_file(package, description) |
| 68 |
|
| 69 |
diff --git a/tests/server.py b/tests/server.py |
| 70 |
index ba4ed99..ef17849 100644 |
| 71 |
--- a/tests/server.py |
| 72 |
+++ b/tests/server.py |
| 73 |
@@ -15,7 +15,7 @@ import http.server, threading |
| 74 |
|
| 75 |
class Server(threading.Thread): |
| 76 |
def __init__(self): |
| 77 |
- super().__init__() |
| 78 |
+ super(Server, self).__init__() |
| 79 |
server_address = ('127.0.0.1', 8080) |
| 80 |
self.httpd = http.server.HTTPServer(server_address, http.server.SimpleHTTPRequestHandler) |
| 81 |
|
| 82 |
|
| 83 |
diff --git a/tests/test_backend.py b/tests/test_backend.py |
| 84 |
index 2c28f79..0ed5ff2 100644 |
| 85 |
--- a/tests/test_backend.py |
| 86 |
+++ b/tests/test_backend.py |
| 87 |
@@ -22,7 +22,7 @@ from tests.base import BaseTest |
| 88 |
class DummyBackend(backend.Backend): |
| 89 |
def __init__(self, PackageDB, EbuildGenrator, MetadataGenerator, directory, |
| 90 |
sync_db=True, eclass_dir=""): |
| 91 |
- super().__init__(PackageDB, EbuildGenrator, MetadataGenerator, directory, |
| 92 |
+ super(DummyBackend, self).__init__(PackageDB, EbuildGenrator, MetadataGenerator, directory, |
| 93 |
sync_db=sync_db, eclass_dir=eclass_dir) |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
diff --git a/tests/test_ebuild.py b/tests/test_ebuild.py |
| 98 |
index 8e7aca4..69222e8 100644 |
| 99 |
--- a/tests/test_ebuild.py |
| 100 |
+++ b/tests/test_ebuild.py |
| 101 |
@@ -22,7 +22,7 @@ package2 = package_db.Package("app-test", "tst", "1") |
| 102 |
|
| 103 |
class DummyDB(package_db.PackageDB): |
| 104 |
def __init__(self, directory, repo_uri="", db_uri=""): |
| 105 |
- super().__init__(directory, repo_uri, db_uri) |
| 106 |
+ super(DummyDB, self).__init__(directory, repo_uri, db_uri) |
| 107 |
|
| 108 |
def generate_tree(self): |
| 109 |
self.add_category("app-test") |
| 110 |
@@ -58,7 +58,7 @@ class TestEbuildGenerator(BaseTest): |
| 111 |
|
| 112 |
class DummyEbuildGeneratorFromFile(ebuild.EbuildGeneratorFromFile): |
| 113 |
def __init__(self, db, path): |
| 114 |
- super().__init__(db) |
| 115 |
+ super(DummyEbuildGeneratorFromFile, self).__init__(db) |
| 116 |
self.path = path |
| 117 |
|
| 118 |
def get_template_file(self, package, description): |
| 119 |
|
| 120 |
diff --git a/tests/test_fileutils.py b/tests/test_fileutils.py |
| 121 |
index 1e3ab1f..4a67712 100644 |
| 122 |
--- a/tests/test_fileutils.py |
| 123 |
+++ b/tests/test_fileutils.py |
| 124 |
@@ -20,7 +20,7 @@ from tests.base import BaseTest |
| 125 |
class TestFileJSON(BaseTest): |
| 126 |
|
| 127 |
def setUp(self): |
| 128 |
- super().setUp() |
| 129 |
+ super(TestFileJSON, self).setUp() |
| 130 |
self.path = os.path.join(self.tempdir.name, 'tst') |
| 131 |
self.name = 'tst.json' |
| 132 |
|
| 133 |
|
| 134 |
diff --git a/tests/test_g_sorcery.py b/tests/test_g_sorcery.py |
| 135 |
index bc91e97..c5a4cfd 100644 |
| 136 |
--- a/tests/test_g_sorcery.py |
| 137 |
+++ b/tests/test_g_sorcery.py |
| 138 |
@@ -21,7 +21,7 @@ from tests.base import BaseTest |
| 139 |
|
| 140 |
class TestBin(BaseTest): |
| 141 |
def setUp(self): |
| 142 |
- super().setUp() |
| 143 |
+ super(TestBin, self).setUp() |
| 144 |
|
| 145 |
binpath = os.path.join(os.path.dirname( |
| 146 |
os.path.dirname(os.path.realpath(__file__))), 'bin') |
| 147 |
|
| 148 |
diff --git a/tests/test_metadata.py b/tests/test_metadata.py |
| 149 |
index 4906541..39155fb 100644 |
| 150 |
--- a/tests/test_metadata.py |
| 151 |
+++ b/tests/test_metadata.py |
| 152 |
@@ -74,7 +74,7 @@ class TestXMLGenerator(BaseTest): |
| 153 |
|
| 154 |
class DummyMetadataGenerator(metadata.MetadataGenerator): |
| 155 |
def __init__(self, db): |
| 156 |
- super().__init__(db) |
| 157 |
+ super(DummyMetadataGenerator, self).__init__(db) |
| 158 |
|
| 159 |
package = package_db.Package("app-test", "test", "0.1") |
| 160 |
|
| 161 |
@@ -98,7 +98,7 @@ resulting_metadata = ['<?xml version="1.0" encoding="utf-8"?>', |
| 162 |
|
| 163 |
class DummyDB(package_db.PackageDB): |
| 164 |
def __init__(self, directory, repo_uri="", db_uri=""): |
| 165 |
- super().__init__(directory, repo_uri, db_uri) |
| 166 |
+ super(DummyDB, self).__init__(directory, repo_uri, db_uri) |
| 167 |
|
| 168 |
def generate_tree(self): |
| 169 |
self.add_category("app-test") |
| 170 |
|
| 171 |
diff --git a/tests/test_package_db.py b/tests/test_package_db.py |
| 172 |
index 6b1004e..0f82129 100644 |
| 173 |
--- a/tests/test_package_db.py |
| 174 |
+++ b/tests/test_package_db.py |
| 175 |
@@ -21,7 +21,7 @@ from tests.base import BaseTest |
| 176 |
|
| 177 |
class DummyDB(package_db.PackageDB): |
| 178 |
def __init__(self, directory, packages): |
| 179 |
- super().__init__(directory) |
| 180 |
+ super(DummyDB, self).__init__(directory) |
| 181 |
self.packages = packages |
| 182 |
|
| 183 |
def generate_tree(self): |
| 184 |
@@ -38,7 +38,7 @@ class DummyDB(package_db.PackageDB): |
| 185 |
class TestDummyDB(BaseTest): |
| 186 |
|
| 187 |
def setUp(self): |
| 188 |
- super().setUp() |
| 189 |
+ super(TestDummyDB, self).setUp() |
| 190 |
category1 = 'app-test' |
| 191 |
category2 = 'dev-test' |
| 192 |
self.packages = [package_db.Package(category1, 'test', '0.2'), |
| 193 |
@@ -48,9 +48,6 @@ class TestDummyDB(BaseTest): |
| 194 |
package_db.Package(category2, 'test', '0.2'), |
| 195 |
package_db.Package(category2, 'tst', '0.1')] |
| 196 |
|
| 197 |
- def tearDown(self): |
| 198 |
- super().tearDown() |
| 199 |
- |
| 200 |
def test_manifest(self): |
| 201 |
db = DummyDB(self.tempdir.name, self.packages) |
| 202 |
db.generate() |
Archives