1 |
commit: e375e104a51dfcfb06176d92adf23eba88e46a3c |
2 |
Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jul 2 12:52:23 2013 +0000 |
4 |
Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Jul 2 12:52:23 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=e375e104 |
7 |
|
8 |
py2: new style objects |
9 |
|
10 |
--- |
11 |
g_sorcery/backend.py | 2 +- |
12 |
g_sorcery/compatibility.py | 2 +- |
13 |
g_sorcery/ebuild.py | 2 +- |
14 |
g_sorcery/fileutils.py | 2 +- |
15 |
g_sorcery/metadata.py | 4 ++-- |
16 |
g_sorcery/package_db.py | 2 +- |
17 |
tests/dummy_backend/backend.py | 2 +- |
18 |
7 files changed, 8 insertions(+), 8 deletions(-) |
19 |
|
20 |
diff --git a/g_sorcery/backend.py b/g_sorcery/backend.py |
21 |
index f472a85..f637ae0 100644 |
22 |
--- a/g_sorcery/backend.py |
23 |
+++ b/g_sorcery/backend.py |
24 |
@@ -15,7 +15,7 @@ import glob, os |
25 |
|
26 |
from .package_db import Package |
27 |
|
28 |
-class Backend: |
29 |
+class Backend(object): |
30 |
def __init__(self, PackageDB, EbuildGenrator, MetadataGenerator, directory, |
31 |
repo_uri="", db_uri="", sync_db=True, eclass_dir=""): |
32 |
self.sync_db = sync_db |
33 |
|
34 |
diff --git a/g_sorcery/compatibility.py b/g_sorcery/compatibility.py |
35 |
index 4fbc3f1..be2988e 100644 |
36 |
--- a/g_sorcery/compatibility.py |
37 |
+++ b/g_sorcery/compatibility.py |
38 |
@@ -19,7 +19,7 @@ if py2k: |
39 |
|
40 |
from tempfile import mkdtemp |
41 |
|
42 |
- class TemporaryDirectory(): |
43 |
+ class TemporaryDirectory(object): |
44 |
def __init__(self): |
45 |
self.name = mkdtemp() |
46 |
|
47 |
|
48 |
diff --git a/g_sorcery/ebuild.py b/g_sorcery/ebuild.py |
49 |
index f36dc42..586bb58 100644 |
50 |
--- a/g_sorcery/ebuild.py |
51 |
+++ b/g_sorcery/ebuild.py |
52 |
@@ -13,7 +13,7 @@ |
53 |
|
54 |
import string |
55 |
|
56 |
-class EbuildGenerator: |
57 |
+class EbuildGenerator(object): |
58 |
def __init__(self, db): |
59 |
self.db = db |
60 |
|
61 |
|
62 |
diff --git a/g_sorcery/fileutils.py b/g_sorcery/fileutils.py |
63 |
index a8415c0..37591b3 100644 |
64 |
--- a/g_sorcery/fileutils.py |
65 |
+++ b/g_sorcery/fileutils.py |
66 |
@@ -15,7 +15,7 @@ import json, os, shutil |
67 |
|
68 |
from .exceptions import FileJSONError |
69 |
|
70 |
-class FileJSON: |
71 |
+class FileJSON(object): |
72 |
def __init__(self, directory, name, mandatories): |
73 |
""" |
74 |
Initialize |
75 |
|
76 |
diff --git a/g_sorcery/metadata.py b/g_sorcery/metadata.py |
77 |
index 7053307..da4d291 100644 |
78 |
--- a/g_sorcery/metadata.py |
79 |
+++ b/g_sorcery/metadata.py |
80 |
@@ -21,7 +21,7 @@ def prettify(tree): |
81 |
reparsed = minidom.parseString(rough_str) |
82 |
return reparsed.toprettyxml(encoding="utf-8").decode("utf-8") |
83 |
|
84 |
-class XMLGenerator: |
85 |
+class XMLGenerator(object): |
86 |
def __init__(self, external, schema): |
87 |
self.external = external |
88 |
self.schema = schema |
89 |
@@ -133,7 +133,7 @@ default_schema = [{'name' : 'herd', |
90 |
] |
91 |
|
92 |
|
93 |
-class MetadataGenerator: |
94 |
+class MetadataGenerator(object): |
95 |
def __init__(self, db, schema = default_schema): |
96 |
self.db = db |
97 |
self.xmlg = XMLGenerator('pkgmetadata', schema) |
98 |
|
99 |
diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py |
100 |
index 179d07d..032c118 100644 |
101 |
--- a/g_sorcery/package_db.py |
102 |
+++ b/g_sorcery/package_db.py |
103 |
@@ -22,7 +22,7 @@ import collections, glob, hashlib, os, shutil, tarfile, tempfile |
104 |
|
105 |
Package = collections.namedtuple("Package", "category name version") |
106 |
|
107 |
-class PackageDB: |
108 |
+class PackageDB(object): |
109 |
def __init__(self, directory, repo_uri="", db_uri=""): |
110 |
self.URI_NAME = 'uri.json' |
111 |
self.INFO_NAME = 'info.json' |
112 |
|
113 |
diff --git a/tests/dummy_backend/backend.py b/tests/dummy_backend/backend.py |
114 |
index 8e43a4f..b0fdc14 100644 |
115 |
--- a/tests/dummy_backend/backend.py |
116 |
+++ b/tests/dummy_backend/backend.py |
117 |
@@ -1,7 +1,7 @@ |
118 |
#!/usr/bin/env python |
119 |
# -*- coding: utf-8 -*- |
120 |
|
121 |
-class Test: |
122 |
+class Test(object): |
123 |
def __init__(self): |
124 |
self.tst = 'test backend' |