From 50c3b9250091782b6f7c6e9fea6dc74e8744bd85 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Mon, 17 Jan 2011 13:23:00 +0200 Subject: [PATCH] Reorder fields in compat-groups, drop .unicode_filename --- rarfile.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/rarfile.py b/rarfile.py index f66c7b8..64950ce 100644 --- a/rarfile.py +++ b/rarfile.py @@ -324,19 +324,23 @@ class RarInfo(object): ''' __slots__ = ( - 'compress_size', + # zipfile-compatible fields + 'filename', 'file_size', - 'host_os', + 'compress_size', + 'date_time', + 'comment', 'CRC', + 'volume', + 'orig_filename', # bytes in unknown encoding + + # rar-specific fields 'extract_version', 'compress_type', + 'host_os', 'mode', 'type', 'flags', - 'volume', - 'filename', - 'date_time', - 'comment', # optional extended time fields # tuple where the sec is float, or datetime(). @@ -345,10 +349,6 @@ class RarInfo(object): 'atime', 'arctime', - # obsolete - 'unicode_filename', # same as filename - 'orig_filename', # bytes in unknown encoding - # RAR internals 'name_size', 'header_size', @@ -794,9 +794,6 @@ class RarFile(object): if PATH_SEP != '\\': h.filename = h.filename.replace('\\', PATH_SEP) - # compat - h.unicode_filename = h.filename - if h.flags & RAR_FILE_SALT: h.salt = h.header_data[pos : pos + 8] pos += 8 -- 2.11.4.GIT