summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2009-01-15 14:04:34 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2009-01-15 14:04:34 +0100
commite828764aa48543e849d601284e58ad6c775c0c23 (patch)
tree10b68356bd183033f6b8fbfd0ab100b6e3918aae
parent2fff426e80aa9a0b348577983dfa5760b0b3300a (diff)
downloadportato-e828764aa48543e849d601284e58ad6c775c0c23.tar.gz
portato-e828764aa48543e849d601284e58ad6c775c0c23.tar.bz2
portato-e828764aa48543e849d601284e58ad6c775c0c23.zip
Removed old, deprecated portage_dep imports
-rw-r--r--portato/backend/portage/package.py5
-rw-r--r--portato/backend/portage/sets.py6
-rw-r--r--portato/backend/portage/system.py4
3 files changed, 1 insertions, 14 deletions
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py
index a87ba94..ba61cc0 100644
--- a/portato/backend/portage/package.py
+++ b/portato/backend/portage/package.py
@@ -20,11 +20,6 @@ from ...helper import debug, error, unique_array
import portage
-try:
- import portage.dep as portage_dep
-except ImportError:
- import portage_dep
-
import os.path
class PortagePackage (Package):
diff --git a/portato/backend/portage/sets.py b/portato/backend/portage/sets.py
index 4d7df73..53025ab 100644
--- a/portato/backend/portage/sets.py
+++ b/portato/backend/portage/sets.py
@@ -16,10 +16,6 @@ import re
import itertools as itt
import portage
-try:
- import portage.dep as portage_dep
-except ImportError:
- import portage_dep
from .. import system
from ...helper import debug
@@ -59,7 +55,7 @@ class FilterSet (Set):
if not re.match(key, pkg, re.I): continue
if not with_version:
- t.add(portage_dep.dep_getkey(pkg))
+ t.add(portage.dep.dep_getkey(pkg))
else:
t.add(system.find_best_match(pkg, only_cpv = True))
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py
index ddee835..24016dc 100644
--- a/portato/backend/portage/system.py
+++ b/portato/backend/portage/system.py
@@ -14,10 +14,6 @@ from __future__ import absolute_import, with_statement
import re, os, os.path
import portage
-try:
- import portage.dep as portage_dep
-except ImportError:
- import portage_dep
from collections import defaultdict
import itertools as itt