| 1 |
commit: 5b1fd173f1709b0eefc4fd6276756e914837f156 |
| 2 |
Author: Arfrever <arfrever <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 30 17:52:08 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 30 17:52:22 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=5b1fd173 |
| 7 |
|
| 8 |
Use isinstance() for compatibility with Python 3. |
| 9 |
|
| 10 |
Reported-By: Arfrever <arfrever <AT> gentoo.org> |
| 11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 12 |
|
| 13 |
--- |
| 14 |
WebappConfig/permissions.py | 6 +++--- |
| 15 |
WebappConfig/wrapper.py | 4 ++-- |
| 16 |
2 files changed, 5 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/WebappConfig/permissions.py b/WebappConfig/permissions.py |
| 19 |
index 13b2c3f..0bf99ea 100644 |
| 20 |
--- a/WebappConfig/permissions.py |
| 21 |
+++ b/WebappConfig/permissions.py |
| 22 |
@@ -25,7 +25,7 @@ __version__ = "$Id: permissions.py 129 2005-11-06 12:46:31Z wrobel $" |
| 23 |
# Dependencies |
| 24 |
# ------------------------------------------------------------------------ |
| 25 |
|
| 26 |
-import re, types, grp, pwd |
| 27 |
+import re, grp, pwd |
| 28 |
|
| 29 |
# ======================================================================== |
| 30 |
# Permission Helper |
| 31 |
@@ -203,7 +203,7 @@ def get_group(group): |
| 32 |
ngroup = -1 |
| 33 |
|
| 34 |
# Can we transform the value to an integer? |
| 35 |
- if type(group) != types.IntType: |
| 36 |
+ if not isinstance(group, int): |
| 37 |
try: |
| 38 |
ngroup = int(group) |
| 39 |
except ValueError: |
| 40 |
@@ -251,7 +251,7 @@ def get_user(user): |
| 41 |
nuser = -1 |
| 42 |
|
| 43 |
# Can we transform the value to an integer? |
| 44 |
- if type(user) != types.IntType: |
| 45 |
+ if not isinstance(user, int): |
| 46 |
try: |
| 47 |
nuser = int(user) |
| 48 |
except ValueError: |
| 49 |
|
| 50 |
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py |
| 51 |
index e0d1e87..fd4b010 100644 |
| 52 |
--- a/WebappConfig/wrapper.py |
| 53 |
+++ b/WebappConfig/wrapper.py |
| 54 |
@@ -26,7 +26,7 @@ __version__ = "$Id: wrapper.py 283 2006-04-20 22:53:04Z wrobel $" |
| 55 |
# Dependencies |
| 56 |
# ------------------------------------------------------------------------ |
| 57 |
|
| 58 |
-import os, types, string |
| 59 |
+import os, string |
| 60 |
|
| 61 |
from WebappConfig.debug import OUT |
| 62 |
|
| 63 |
@@ -133,7 +133,7 @@ def package_installed(full_name, pm): |
| 64 |
t = portage.db[portage.root]["vartree"].dbapi.match(full_name) |
| 65 |
# catch the "ambiguous package" Exception |
| 66 |
except ValueError as e: |
| 67 |
- if type(e[0]) == types.ListType: |
| 68 |
+ if isinstance(e[0], list): |
| 69 |
t = [] |
| 70 |
for cp in e[0]: |
| 71 |
t += portage.db[portage.root]["vartree"].dbapi.match(cp) |
Archives