diff options
author | Helmut Grohne <helmut@subdivi.de> | 2015-04-16 17:58:56 +0200 |
---|---|---|
committer | Helmut Grohne <helmut@subdivi.de> | 2015-04-16 17:58:56 +0200 |
commit | cb768bea25f2773e3c97abd6bc786aa05c8deb87 (patch) | |
tree | 622142dfd39f03c2c9adee61f88ba5b102133660 /dedup | |
parent | 2d39544e07d90d6f351d55930ce917d9715a7946 (diff) | |
download | debian-dedup-cb768bea25f2773e3c97abd6bc786aa05c8deb87.tar.gz |
process_control: do not encode to ascii
Otherwise the yaml will contain binary strings on py3k which end up as
binary data in the sqlite database. In py2, yaml can handle those
unicode objects just fine.
Diffstat (limited to 'dedup')
-rw-r--r-- | dedup/debpkg.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dedup/debpkg.py b/dedup/debpkg.py index dbee849..8f2121b 100644 --- a/dedup/debpkg.py +++ b/dedup/debpkg.py @@ -9,15 +9,15 @@ def process_control(control_contents): @rtype: {str: object} """ control = deb822.Packages(control_contents) - package = control["package"].encode("ascii") + package = control["package"] try: - source = control["source"].encode("ascii").split()[0] + source = control["source"].split()[0] except KeyError: source = package - version = control["version"].encode("ascii") - architecture = control["architecture"].encode("ascii") + version = control["version"] + architecture = control["architecture"] # deb822 currently returns :any dependencies raw. see #670679 - depends = set(dep[0]["name"].split(u':', 1)[0].encode("ascii") + depends = set(dep[0]["name"].split(u':', 1)[0] for dep in control.relations.get("depends", ()) if len(dep) == 1) return dict(package=package, source=source, version=version, |