[gentoo-commits] proj/gentoopm:master commit in: gentoopm/tests/, gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/

[gentoo-commits] proj/gentoopm:master commit in: gentoopm/tests/, gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/

[Michał Górny]

commit:     638d8ad1bb0c318dceb50c8491c7b04a628361ea
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 10:05:54 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 10:05:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=638d8ad1

Py3: basestring -> str.

---
 gentoopm/paludispm/repo.py   |    2 +-
 gentoopm/pkgcorepm/filter.py |    2 +-
 gentoopm/pkgcorepm/pkg.py    |    2 +-
 gentoopm/portagepm/pkg.py    |    2 +-
 gentoopm/portagepm/repo.py   |    2 +-
 gentoopm/tests/__init__.py   |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gentoopm/paludispm/repo.py b/gentoopm/paludispm/repo.py
index 7326850..04a651c 100644
--- a/gentoopm/paludispm/repo.py
+++ b/gentoopm/paludispm/repo.py
@@ -46,7 +46,7 @@ class PaludisRepository(PMRepository, PaludisPackageSet):
 		newargs = []
 
 		for f in args:
-			if isinstance(f, basestring):
+			if isinstance(f, str):
 				f = PaludisAtom(f, self._env)
 			if isinstance(f, PaludisAtom):
 				pset = PaludisAtomFilteredRepo(pset, f)

diff --git a/gentoopm/pkgcorepm/filter.py b/gentoopm/pkgcorepm/filter.py
index d7218b7..1f49144 100644
--- a/gentoopm/pkgcorepm/filter.py
+++ b/gentoopm/pkgcorepm/filter.py
@@ -21,7 +21,7 @@ def transform_filters(args, kwargs):
 	f = []
 
 	for a in args:
-		if isinstance(a, basestring):
+		if isinstance(a, str):
 			a = PkgCoreAtom(a)
 		if isinstance(a, PkgCoreAtom):
 			f.append(a._r)

diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py
index 1fc59dc..472d92c 100644
--- a/gentoopm/pkgcorepm/pkg.py
+++ b/gentoopm/pkgcorepm/pkg.py
@@ -9,7 +9,7 @@ from gentoopm.pkgcorepm.atom import PkgCoreAtom
 
 class PkgCorePackageSet(PMPackageSet):
 	def filter(self, *args, **kwargs):
-		newargs = [(a if not isinstance(a, basestring)
+		newargs = [(a if not isinstance(a, str)
 			else PkgCoreAtom(a)) for a in args]
 
 		return PkgCoreFilteredPackageSet(self, newargs, kwargs)

diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py
index 6fa4a7e..b4ae7a6 100644
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@ -13,7 +13,7 @@ from gentoopm.portagepm.atom import PortageAtom
 
 class PortagePackageSet(PMPackageSet):
 	def filter(self, *args, **kwargs):
-		newargs = [(a if not isinstance(a, basestring)
+		newargs = [(a if not isinstance(a, str)
 			else PortageAtom(a)) for a in args]
 
 		return PortageFilteredPackageSet(self, newargs, kwargs)

diff --git a/gentoopm/portagepm/repo.py b/gentoopm/portagepm/repo.py
index c8e55f5..d3cd9c6 100644
--- a/gentoopm/portagepm/repo.py
+++ b/gentoopm/portagepm/repo.py
@@ -79,7 +79,7 @@ class PortDBRepository(PortagePackageSet, PMRepository):
 		newargs = []
 		filt = None
 		for a in args:
-			if isinstance(a, basestring):
+			if isinstance(a, str):
 				a = PortageAtom(a)
 			if isinstance(a, CompletePortageAtom) and filt is None:
 				filt = a

diff --git a/gentoopm/tests/__init__.py b/gentoopm/tests/__init__.py
index d4b2a75..02e2ac9 100644
--- a/gentoopm/tests/__init__.py
+++ b/gentoopm/tests/__init__.py
@@ -33,7 +33,7 @@ class PMTestLoader(unittest.TestLoader):
 		unittest.TestLoader.__init__(self)
 
 	def loadTestsFromModule(self, mod):
-		if isinstance(mod, basestring):
+		if isinstance(mod, str):
 			mod = __import__(mod, fromlist=['.'], level=-1)
 		return unittest.TestLoader.loadTestsFromModule(self, mod)