| 1 |
commit: 21a203cfb79726d6798ca878e52b8ab39ef9b15a |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Thu Jun 28 23:23:28 2012 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 29 12:50:24 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=21a203cf |
| 7 |
|
| 8 |
Use str.join() instead of string.join() for compatibility with Python 3. |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
WebappConfig/sandbox.py | 4 ++-- |
| 14 |
WebappConfig/wrapper.py | 6 +++--- |
| 15 |
2 files changed, 5 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/WebappConfig/sandbox.py b/WebappConfig/sandbox.py |
| 18 |
index 698a566..bb92c50 100644 |
| 19 |
--- a/WebappConfig/sandbox.py |
| 20 |
+++ b/WebappConfig/sandbox.py |
| 21 |
@@ -24,7 +24,7 @@ __version__ = "$Id: permissions.py 129 2005-11-06 12:46:31Z wrobel $" |
| 22 |
# Dependencies |
| 23 |
# ------------------------------------------------------------------------ |
| 24 |
|
| 25 |
-import os, os.path, string, sys |
| 26 |
+import os, os.path, sys |
| 27 |
|
| 28 |
# stolen from portage |
| 29 |
if os.path.isdir("/proc/%i/fd" % os.getpid()): |
| 30 |
@@ -55,7 +55,7 @@ class Sandbox: |
| 31 |
|
| 32 |
def get_write(self): |
| 33 |
'''Return write paths.''' |
| 34 |
- return string.join ( map ( self.get_config, self.__write ), ':' ) \ |
| 35 |
+ return ':'.join ( map ( self.get_config, self.__write ) ) \ |
| 36 |
+ self.__syswrite |
| 37 |
|
| 38 |
def get_config(self, option): |
| 39 |
|
| 40 |
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py |
| 41 |
index fd4b010..1897dd6 100644 |
| 42 |
--- a/WebappConfig/wrapper.py |
| 43 |
+++ b/WebappConfig/wrapper.py |
| 44 |
@@ -26,7 +26,7 @@ __version__ = "$Id: wrapper.py 283 2006-04-20 22:53:04Z wrobel $" |
| 45 |
# Dependencies |
| 46 |
# ------------------------------------------------------------------------ |
| 47 |
|
| 48 |
-import os, string |
| 49 |
+import os |
| 50 |
|
| 51 |
from WebappConfig.debug import OUT |
| 52 |
|
| 53 |
@@ -62,7 +62,7 @@ def config_protect(cat, pn, pvr, pm): |
| 54 |
fo.close() |
| 55 |
fe.close() |
| 56 |
|
| 57 |
- return string.join(result_lines, ' ').strip() |
| 58 |
+ return ' '.join(result_lines).strip() |
| 59 |
else: |
| 60 |
OUT.die("Unknown package manager: " + pm) |
| 61 |
|
| 62 |
@@ -156,7 +156,7 @@ def package_installed(full_name, pm): |
| 63 |
for i in error_lines: |
| 64 |
OUT.warn(i) |
| 65 |
|
| 66 |
- return string.join(result_lines, ' ') |
| 67 |
+ return ' '.join(result_lines) |
| 68 |
|
| 69 |
else: |
| 70 |
OUT.die("Unknown package manager: " + pm) |
Archives