diff options
| author | jvoisin | 2013-10-30 14:34:42 +0000 |
|---|---|---|
| committer | jvoisin | 2013-10-30 14:34:42 +0000 |
| commit | a646ebbd3a0f54b43fc610134d2ebb39b5c4c732 (patch) | |
| tree | c1f91bd5b7f334f13799ba8ad62407c7a904ac39 /MAT/misc.py | |
| parent | de28b830e9490a1283b9a3b68de4bf48c11d944c (diff) | |
First steps toward a Python3 support
Diffstat (limited to 'MAT/misc.py')
| -rw-r--r-- | MAT/misc.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/MAT/misc.py b/MAT/misc.py index b0c22f4..3f24ece 100644 --- a/MAT/misc.py +++ b/MAT/misc.py | |||
| @@ -19,7 +19,7 @@ class TorrentStripper(parser.GenericParser): | |||
| 19 | ''' Get recursively all keys from a dict and | 19 | ''' Get recursively all keys from a dict and |
| 20 | its subdicts | 20 | its subdicts |
| 21 | ''' | 21 | ''' |
| 22 | for (i,j) in dictionary.items(): | 22 | for (i,j) in list(dictionary.items()): |
| 23 | if isinstance(j, dict): | 23 | if isinstance(j, dict): |
| 24 | return set([i]).union(self.__get_key_recursively(j)) | 24 | return set([i]).union(self.__get_key_recursively(j)) |
| 25 | return set([i]) | 25 | return set([i]) |
| @@ -35,11 +35,11 @@ class TorrentStripper(parser.GenericParser): | |||
| 35 | ''' Get recursively all harmful metadata | 35 | ''' Get recursively all harmful metadata |
| 36 | ''' | 36 | ''' |
| 37 | d = dict() | 37 | d = dict() |
| 38 | for(i,j) in dictionary.items(): | 38 | for(i,j) in list(dictionary.items()): |
| 39 | if i not in self.fields: | 39 | if i not in self.fields: |
| 40 | d[i] = j | 40 | d[i] = j |
| 41 | elif isinstance(j, dict): | 41 | elif isinstance(j, dict): |
| 42 | d = dict(d.items() + self.__get_meta_recursively(j).items()) | 42 | d = dict(d.items() + list(self.__get_meta_recursively(j).items())) |
| 43 | return d | 43 | return d |
| 44 | 44 | ||
| 45 | def get_meta(self): | 45 | def get_meta(self): |
| @@ -53,9 +53,9 @@ class TorrentStripper(parser.GenericParser): | |||
| 53 | ''' Remove recursively all compromizing fields | 53 | ''' Remove recursively all compromizing fields |
| 54 | ''' | 54 | ''' |
| 55 | d = dict() | 55 | d = dict() |
| 56 | for(i,j) in filter(lambda i: i in self.fields, dictionary.items()): | 56 | for (i,j) in [i for i in list(dictionary.items()) if i in self.fields]: |
| 57 | if isinstance(j, dict): | 57 | if isinstance(j, dict): |
| 58 | d = dict(d.items() + self.__get_meta_recursively(j).items()) | 58 | d = dict(list(d.items()) + list(self.__get_meta_recursively(j).items())) |
| 59 | else: | 59 | else: |
| 60 | d[i] = j | 60 | d[i] = j |
| 61 | return d | 61 | return d |
| @@ -67,7 +67,7 @@ class TorrentStripper(parser.GenericParser): | |||
| 67 | with open(self.filename, 'r') as f: | 67 | with open(self.filename, 'r') as f: |
| 68 | decoded = bencode.bdecode(f.read()) | 68 | decoded = bencode.bdecode(f.read()) |
| 69 | 69 | ||
| 70 | cleaned = {i:j for i,j in decoded.items() if i in self.fields} | 70 | cleaned = {i:j for i,j in list(decoded.items()) if i in self.fields} |
| 71 | 71 | ||
| 72 | with open(self.output, 'w') as f: # encode the decoded torrent | 72 | with open(self.output, 'w') as f: # encode the decoded torrent |
| 73 | f.write(bencode.bencode(cleaned)) # and write it in self.output | 73 | f.write(bencode.bencode(cleaned)) # and write it in self.output |
