1 |
commit: fe8b1f48236ac32bb5ab82e4e7bb02f95c3859b3 |
2 |
Author: Tom Wijsman <tomwij <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 2 14:56:43 2014 +0000 |
4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Jun 2 15:42:51 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fe8b1f48 |
7 |
|
8 |
repoman/{argparser,metadata}.py: Fix up missing imports and definition |
9 |
|
10 |
--- |
11 |
pym/repoman/argparser.py | 1 + |
12 |
pym/repoman/metadata.py | 3 +++ |
13 |
2 files changed, 4 insertions(+) |
14 |
|
15 |
diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py |
16 |
index 5005798..19ec6e9 100644 |
17 |
--- a/pym/repoman/argparser.py |
18 |
+++ b/pym/repoman/argparser.py |
19 |
@@ -4,6 +4,7 @@ |
20 |
|
21 |
"""This module contains functions used in Repoman to parse CLI arguments.""" |
22 |
|
23 |
+import logging |
24 |
import portage |
25 |
from portage import util |
26 |
from portage.util._argparse import ArgumentParser |
27 |
|
28 |
diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py |
29 |
index f281523..b4950ad 100644 |
30 |
--- a/pym/repoman/metadata.py |
31 |
+++ b/pym/repoman/metadata.py |
32 |
@@ -1,6 +1,7 @@ |
33 |
|
34 |
import errno |
35 |
import logging |
36 |
+import sys |
37 |
import tempfile |
38 |
import time |
39 |
|
40 |
@@ -15,6 +16,8 @@ from portage import exception |
41 |
from portage import os |
42 |
from portage.output import green |
43 |
|
44 |
+if sys.hexversion >= 0x3000000: |
45 |
+ basestring = str |
46 |
|
47 |
metadata_xml_encoding = 'UTF-8' |
48 |
metadata_xml_declaration = '<?xml version="1.0" encoding="%s"?>' \ |