From: Martin Jansa Date: Thu, 29 Mar 2012 13:44:14 +0200 Subject: [PATCH] opkg.py: use string funtcions directly on string variable Signed-off-by: Martin Jansa --- opkg-make-index | 3 +-- opkg-show-deps | 11 +++++------ opkg.py | 5 ++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/opkg-make-index b/opkg-make-index index e0844a7..898a2f6 100755 --- a/opkg-make-index +++ b/opkg-make-index @@ -5,7 +5,6 @@ from glob import glob import subprocess import opkg import getopt -import string import re verbose = 0 @@ -158,7 +157,7 @@ for name in names: try: pkg = packages.packages[name] if locales_dir and pkg.depends: - depends = string.split(pkg.depends, ',') + depends = pkg.depends.split(',') locale = None for d in depends: m = re.match('.*virtual-locale-([a-zA-Z]+).*', d) diff --git a/opkg-show-deps b/opkg-show-deps index 3f5899d..d188aad 100755 --- a/opkg-show-deps +++ b/opkg-show-deps @@ -4,7 +4,6 @@ import sys, os, posixpath from glob import glob import opkg import getopt -import string import re verbose = 0 @@ -32,11 +31,11 @@ provider_hash = {} def split_list(str): r = [] - l = string.split(str, ",") + l = str.split(",") for i in l: - ll = string.split(i, "|") + ll = i.split("|") for ii in ll: - ii = string.strip(ii) + ii = ii.strip() r.append(ii) return r @@ -46,9 +45,9 @@ for i in list(packages.packages.keys()): provider_hash[p.package] = [] provider_hash[p.package].append(p) if p.provides: - provides = string.split(p.provides, ",") + provides = p.provides.split(",") for prov in provides: - prov = string.strip(prov) + prov = prov.strip() if prov not in provider_hash: provider_hash[prov] = [] provider_hash[prov].append(p) diff --git a/opkg.py b/opkg.py index ae31794..856e057 100644 --- a/opkg.py +++ b/opkg.py @@ -38,7 +38,6 @@ import sys import glob import hashlib import re -import string import subprocess from stat import ST_SIZE import arfile @@ -203,10 +202,10 @@ class Package: line = control.readline() while 1: if not line: break - line = string.rstrip(line) + line = line.rstrip() lineparts = re.match(r'([\w-]*?):\s*(.*)', line) if lineparts: - name = string.lower(lineparts.group(1)) + name = lineparts.group(1).lower() value = lineparts.group(2) while 1: line = control.readline()