Первая версия модуля для kodi

- hash fields method and parameter allow user customize hash field list
- hash raw parameter allow the output of hash field to be raw bytes
- BEncoder now support encode raw bytes

CHANGELOG.md

@@ -1,85 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## [0.2.0] - 2018.5.25
-
-### Change
-
-- Just bump version to 0.2.0 to follow semver.
-
-## [0.1.5rc1] - 2018.4.28
-
-### Added
-
-- `TorrentFileCreator` class and `create_torrent_file` shortcut function for write back data to a torrent file
-
-## [0.1.4] - 2018-04-06
-
-### Added
-
-- `encoding` option can be `auto`, which will use `chardet` package to decide which encoding to use. If `chardet` is noe installed, will raise a warning and fallback to 'utf-8'. (Thanks to [@ltfychrise])
-- Add changelog.
-
-### Change
-
-- Reorganize test codes/files.
-
-### Fixed
-
-- Fix integer filed can't be negative bug. (Thanks to [@ltfychrise])
-- Fix `_seek_back` method not make `_pos` back bug. (Thanks to [@ltfychrise])
-
-## [0.1.3] - 2017-06-21
-
-### Added
-
-- Now `UnicodeDecodeError` is wrapped in `InvalidTorrentDataException`.
-
-### Fixed
-
-- Use `IOError` instead of `FileNotFoundError` in Python 2.
-
-### Changed
-
-- `InvalidTorrentFileException` rename to `InvalidTorrentDataException`.
-
-## [0.1.2] - 2017-06-21
-
-### Changed
-
-- Emm, I don't know, I just changed the version code...
-
-## [0.1.1] - 2017-06-20
-
-### Added
-
-- CLI add coding `--coding/-c` option for file string filed encoding.
-
-### Changed
-
-- `ed2k` and `filehash` field now use same structure as 'pieces'.
-
-## [0.1.0] - 2017-05-23
-
-### Added
-
-- Parse torrent from file and data into a dict.
-- CLI provided.
-- Simple tests.
-- Available on pip.
-
-[@ltfychrise]: https://github.com/ltfychrise
-[Unreleased]: https://github.com/7sDream/torrent_parser/compare/v0.2.0...HEAD
-[0.2.0]: https://github.com/7sDream/torrent_parser/compare/v0.1.5rc1...v0.2.0
-[0.1.5rc1]: https://github.com/7sDream/torrent_parser/compare/v0.1.4...v0.1.5rc1
-[0.1.4]: https://github.com/7sDream/torrent_parser/compare/v0.1.3...v0.1.4
-[0.1.3]: https://github.com/7sDream/torrent_parser/compare/v0.1.2...v0.1.3
-[0.1.2]: https://github.com/7sDream/torrent_parser/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/7sDream/torrent_parser/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/7sDream/torrent_parser/tree/v0.1.0

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 7sDream
+Copyright (c) 2017 - 2018 7sDream
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,3 +0,0 @@
-include README.md LICENSE CHANGELOG.md
-include test.py
-include test.torrent

README.md

@@ -4,6 +4,14 @@ A simple parser for `.torrent` file.
 
 Can also edit and write back to torrent format after version 0.2.0.
 
+## Features
+
+- Decoder and encoder for torrent files
+- Auto decode bytes field to string with used specified encoding and error handler
+- Auto detect encoding when use `auto` as encoding(need `chardet` installed)
+- Auto decode hash value filed to hash blocks, also customizable
+- CLI provided, with JSON output
+
 ## Install
 
 ```
@@ -34,12 +42,23 @@ $ cat test.torrent | pytp
 ```pycon
 >>> import torrent_parser as tp
 >>> data = tp.parse_torrent_file('test.torrent')
->>> print(data['announce'])
+>>> data['announce']
 http://tracker.trackerfix.com:80/announce
 >>> data['announce'] = 'http://127.0.0.1:12345'
 >>> tp.create_torrent_file('new.torrent', data)
 ```
 
+or you don't operate with file, just raw bytes:
+
+```pycon
+>>> import torrent_parser as tp
+>>> data = tp.decode(b'd3:negi-1ee')
+>>> data['neg']
+-1
+>>> tp.encode(data)
+b'd3:negi-1ee'
+```
+
 ## Test
 
 ```bash

addon.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="script.module.torrent_parser" name="torrent_parser" version="0.3.0" provider-name="inpos">
+    <requires>
+        <import addon="xbmc.python" version="2.25.0"/>
+        <import addon="script.module.chardet" />
+    </requires>
+    <extension point="xbmc.python.module" library="lib"/>
+    <extension point="xbmc.addon.metadata">
+        <platform>all</platform>
+        <language>en_GB ru_RU</language>
+        <summary lang="en_GB">Torrent file parser and creator for Python</summary>
+        <summary lang="ru_RU">Обработка и создание файлов .torrent</summary>
+        <description lang="ru">Разработан 7sDream (https://github.com/7sDream/torrent_parser)</description>
+        <description lang="en">Developed by 7sDream (https://github.com/7sDream/torrent_parser)</description>
+        <email>roman@ukamnya.ru</email>
+        <source>https://git.ukamnya.ru/roman/script.module.torrent_parser</source></extension>
+</addon>

lib/torrent_parser.py

@@ -26,6 +26,11 @@ Usage:
     with open('new.torrent', 'wb') as f:
         f.write(TorrentFileCreator(data).encode())
 
+    # or you don't deal with file, just object in memory
+
+    data = decode(b'i12345e') # data = 12345
+    content = encode(data) # content = b'i12345e'
+
 """
 
 from __future__ import print_function, unicode_literals
@@ -62,14 +67,17 @@ except NameError:
     str_type = str
 
 __all__ = [
+    'InvalidTorrentDataException',
+    'BEncoder',
+    'BDecoder',
+    'encode',
+    'decode',
+    'TorrentFileParser',
     'create_torrent_file',
     'parse_torrent_file',
-    'InvalidTorrentDataException',
-    'TorrentFileCreator',
-    'TorrentFileParser',
 ]
 
-__version__ = '0.2.0'
+__version__ = '0.3.0'
 
 
 def detect(content):
@@ -90,6 +98,12 @@ class __EndCls(object):
 _END = __EndCls()
 
 
+def _check_hash_field_params(name, value):
+    return isinstance(name, str_type) \
+           and isinstance(value, tuple) and len(value) == 2 \
+           and isinstance(value[0], int) and isinstance(value[1], bool)
+
+
 class TorrentFileParser(object):
 
     TYPE_LIST = 'list'
@@ -105,7 +119,7 @@ class TorrentFileParser(object):
     STRING_INDICATOR = b''
     STRING_DELIMITER = b':'
 
-    RAW_FIELD_PARAMS = {
+    HASH_FIELD_PARAMS = {
         # field length need_list
         'pieces': (20, True),
         'ed2k': (16, False),
@@ -120,29 +134,69 @@ class TorrentFileParser(object):
         (TYPE_STRING, STRING_INDICATOR),
     ]
 
-    def __init__(self, fp, use_ordered_dict=False, encoding='utf-8'):
+    def __init__(
+            self, fp, use_ordered_dict=False, encoding='utf-8', errors='strict',
+            hash_fields=None, hash_raw=False,
+    ):
         """
         :param fp: a **binary** file-like object to parse,
           which means need 'b' mode when use built-in open function
-        :param encoding: file content encoding, default utf-8, use 'auto' to
-          enable charset auto detection ('chardet' package should be installed)
-        :param use_ordered_dict: Use collections.OrderedDict as dict container
-          default False, which mean use built-in dict
+        :param bool use_ordered_dict: Use collections.OrderedDict as dict
+          container default False, which mean use built-in dict
+        :param str encoding: file content encoding, default utf-8, use 'auto'
+          to enable charset auto detection (need 'chardet' package installed)
+        :param str errors: how to deal with encoding error when try to parse
+          string from content with ``encoding``
+        :param Dict[str, Tuple[int, bool]] hash_fields: extra fields should
+          be treated as hash value. dict key is the field name, value is a
+          two-element tuple of (hash_block_length, as_a_list).
+          See :any:`hash_field` for detail
         """
         if getattr(fp, 'read', ) is None \
                 or getattr(fp, 'seek') is None:
-            raise ValueError('Argument fp needs a file like object')
+            raise ValueError('Parameter fp needs a file like object')
 
         self._pos = 0
         self._encoding = encoding
         self._content = fp
         self._use_ordered_dict = use_ordered_dict
+        self._error_handler = errors
+        self._hash_fields = dict(TorrentFileParser.HASH_FIELD_PARAMS)
+        if hash_fields is not None:
+            for k, v in hash_fields.items():
+                if _check_hash_field_params(k, v):
+                    self._hash_fields[k] = v
+                else:
+                    raise ValueError(
+                        "Invalid hash field parameter, it should be type of "
+                        "Dict[str, Tuple[int, bool]]"
+                    )
+        self._hash_raw = bool(hash_raw)
+
+    def hash_field(self, name, block_length=20, need_list=False):
+        """
+        Let field with the `name` to be treated as hash value, don't decode it
+        as a string.
+
+        :param str name: field name
+        :param int block_length: hash block length for split
+        :param bool need_list:  if True, when the field only has one block(
+          or even empty) its parse result will be a one-element list(
+          or empty list); If False, will be a string in 0 or 1 block condition
+        :return: return self, so you can chained call
+        """
+        v = (block_length, need_list)
+        if _check_hash_field_params(name, v):
+            self._hash_fields[name] = v
+        else:
+            raise ValueError("Invalid hash field parameter")
+        return self
 
     def parse(self):
         """
-        :return: the parse result
-        :type: depends on ``use_ordered_dict`` option when init the parser
-          see :any:`TorrentFileParser.__init__`
+        :rtype: dict|list|int|str|bytes
+        :raise: :any:`InvalidTorrentDataException` when parse failed or error
+          happened when decode string using specified encoding
         """
         self._restart()
         data = self._next_element()
@@ -155,11 +209,8 @@ class TorrentFileParser(object):
         except EOFError:  # expect EOF
             pass
 
-        if isinstance(data, dict):
         return data
 
-        raise InvalidTorrentDataException('Outermost element is not a dict')
-
     def _read_byte(self, count=1, raise_eof=False):
         assert count >= 0
         gotten = self._content.read(count)
@@ -186,11 +237,14 @@ class TorrentFileParser(object):
             k = self._next_element()
             if k is _END:
                 return
-            if k in self.RAW_FIELD_PARAMS:
-                length, need_list = self.RAW_FIELD_PARAMS[k]
-                v = self._next_hash(length, need_list)
+            if not isinstance(k, str_type):
+                raise InvalidTorrentDataException(
+                    self._pos, "Type of dict key can't be " + type(k).__name__
+                )
+            if k in self._hash_fields:
+                v = self._next_hash(*self._hash_fields[k])
             else:
-                v = self._next_element()
+                v = self._next_element(k)
             if k == 'encoding':
                 self._encoding = v
             yield k, v
@@ -225,29 +279,43 @@ class TorrentFileParser(object):
             char = self._read_byte(1)
         return -value if neg else value
 
-    def _next_string(self, decode=True):
+    def _next_string(self, need_decode=True, field=None):
         length = self._next_int(self.STRING_DELIMITER)
         raw = self._read_byte(length)
-        if decode:
+        if need_decode:
             encoding = self._encoding
             if encoding == 'auto':
-                encoding = detect(raw)
+                self.encoding = encoding = detect(raw)
             try:
-                string = raw.decode(encoding)
+                string = raw.decode(encoding, self._error_handler)
             except UnicodeDecodeError as e:
+                msg = [
+                    "Fail to decode string at pos {pos} using encoding ",
+                    e.encoding
+                ]
+                if field:
+                    msg.extend([
+                        ' when parser field "', field, '"'
+                        ', maybe it is an hash field. ',
+                        'You can use self.hash_field("', field, '") ',
+                        'to let it be treated as hash value, ',
+                        'so this error may disappear'
+                    ])
                 raise InvalidTorrentDataException(
                     self._pos - length + e.start,
-                    "Fail to decode string at pos {pos} using " + e.encoding
+                    ''.join(msg)
                 )
             return string
         return raw
 
     def _next_hash(self, p_len, need_list):
-        raw = self._next_string(decode=False)
+        raw = self._next_string(need_decode=False)
         if len(raw) % p_len != 0:
             raise InvalidTorrentDataException(
                 self._pos - len(raw), "Hash bit length not match at pos {pos}"
             )
+        if self._hash_raw:
+            return raw
         res = [
             binascii.hexlify(chunk).decode('ascii')
             for chunk in (raw[x:x+p_len] for x in range(0, len(raw), p_len))
@@ -274,44 +342,59 @@ class TorrentFileParser(object):
     def _type_to_func(self, t):
         return getattr(self, '_next_' + t)
 
-    def _next_element(self):
+    def _next_element(self, field=None):
         element_type = self._next_type()
+        if element_type is TorrentFileParser.TYPE_STRING and field is not None:
+            element = self._type_to_func(element_type)(field=field)
+        else:
             element = self._type_to_func(element_type)()
         return element
 
 
-class TorrentFileCreator(object):
+class BEncoder(object):
 
     TYPES = {
         (dict,): TorrentFileParser.TYPE_DICT,
         (list,): TorrentFileParser.TYPE_LIST,
         (int,): TorrentFileParser.TYPE_INT,
-        (str_type,): TorrentFileParser.TYPE_STRING,
+        (str_type, bytes): TorrentFileParser.TYPE_STRING,
     }
 
-    def __init__(self, data, encoding='utf-8'):
+    def __init__(self, data, encoding='utf-8', hash_fields=None):
         """
-        :param data: torrent data, must be a dict or OrderedDict
-        :param encoding: string field output encoding
+        :param dict|list|int|str data: data will be encoded
+        :param str encoding: string field output encoding
+        :param List[str] hash_fields: see
+          :any:`TorrentFileParser.__init__`
         """
-        if not isinstance(data, dict):
-            raise InvalidTorrentDataException(
-                None,
-                "Top level structure should be a dict"
-            )
         self._data = data
         self._encoding = encoding
+        self._hash_fields = list(TorrentFileParser.HASH_FIELD_PARAMS.keys())
+        if hash_fields is not None:
+            self._hash_fields.extend(str_type(hash_fields))
+
+    def hash_field(self, name):
+        """
+        see :any:`TorrentFileParser.hash_field`
+
+        :param str name:
+        :return: return self, so you can chained call
+        """
+        return self._hash_fields.append(str_type(name))
 
     def encode(self):
         """
-        Encode data to bytes that conform to torrent file format
+        Encode to bytes
+
+        :rtype: bytes
         """
         return b''.join(self._output_element(self._data))
 
-    def encode_to_readable(self):
+    def encode_to_filelike(self):
         """
-        Encode data to a file-like(BytesIO) object which contains the result of
-        `TorrentFileCreator.encode()`
+        Encode to a file-like(BytesIO) object
+
+        :rtype: BytesIO
         """
         return io.BytesIO(self.encode())
 
@@ -364,7 +447,7 @@ class TorrentFileCreator(object):
                 )
             for x in self._output_element(k):
                 yield x
-            if k in TorrentFileParser.RAW_FIELD_PARAMS:
+            if k in self._hash_fields:
                 for x in self._output_decode_hash(v):
                     yield x
             else:
@@ -393,29 +476,119 @@ class TorrentFileCreator(object):
         )
 
 
-def parse_torrent_file(filename, use_ordered_dict=False):
+class BDecoder(object):
+    def __init__(
+        self, data, use_ordered_dict=False, encoding='utf-8', errors='strict',
+        hash_fields=None, hash_raw=False,
+    ):
+        """
+        See :any:`TorrentFileParser.__init__` for parameter description.
+
+        :param bytes data: raw data to be decoded
+        :param bool use_ordered_dict:
+        :param str encoding:
+        :param str errors:
+        :param Dict[str, Tuple[int, bool]] hash_fields:
+        :param bool hash_raw:
+        """
+        self._parser = TorrentFileParser(
+            io.BytesIO(bytes(data)),
+            use_ordered_dict,
+            encoding,
+            errors,
+            hash_fields,
+            hash_raw,
+        )
+
+    def hash_field(self, name, block_length=20, need_dict=False):
+        """
+        See :any:`TorrentFileParser.hash_field` for parameter description
+
+        :param name:
+        :param block_length:
+        :param need_dict:
+        :return: return self, so you can chained call
+        """
+        self._parser.hash_field(name, block_length, need_dict)
+        return self
+
+    def decode(self):
+        return self._parser.parse()
+
+
+def encode(data, encoding='utf-8', hash_fields=None):
+    """
+    Shortcut function for encode python object to torrent file format(bencode)
+
+    See :any:`BEncoder.__init__` for parameter description
+
+    :param dict|list|int|str|bytes data: data to be encoded
+    :param str encoding:
+    :param List[str] hash_fields:
+    :rtype: bytes
+    """
+    return BEncoder(data, encoding, hash_fields).encode()
+
+
+def decode(
+        data, use_ordered_dict=False, encoding='utf-8', errors='strict',
+        hash_fields=None, hash_raw=False,
+):
+    """
+    Shortcut function for decode bytes as torrent file format(bencode) to python
+    object
+
+    See :any:`BDecoder.__init__` for parameter description
+
+    :param bytes data: raw data to be decoded
+    :param bool use_ordered_dict:
+    :param str encoding:
+    :param str errors:
+    :param Dict[str, Tuple[int, bool]] hash_fields:
+    :param bool hash_raw:
+    :rtype: dict|list|int|str|bytes|bytes
+    """
+    return BDecoder(
+        data, use_ordered_dict, encoding, errors, hash_fields, hash_raw,
+    ).decode()
+
+
+def parse_torrent_file(
+        filename, use_ordered_dict=False, encoding='utf-8', errors='strict',
+        hash_fields=None, hash_raw=False,
+):
     """
     Shortcut function for parse torrent object using TorrentFileParser
 
-    :param string filename: torrent filename
-    :param bool use_ordered_dict: see :any:`TorrentFileParser.__init__`
-    :rtype: dict if ``use_ordered_dict`` is false,
-      collections.OrderedDict otherwise
+    See :any:`TorrentFileParser.__init__` for parameter description
+
+    :param str filename: torrent filename
+    :param bool use_ordered_dict:
+    :param str encoding:
+    :param str errors:
+    :param Dict[str, Tuple[int, bool]] hash_fields:
+    :param bool hash_raw:
+    :rtype: dict|list|int|str|bytes
     """
     with open(filename, 'rb') as f:
-        return TorrentFileParser(f, use_ordered_dict).parse()
+        return TorrentFileParser(
+            f, use_ordered_dict, encoding, errors, hash_fields, hash_raw,
+        ).parse()
 
 
-def create_torrent_file(filename, data, encoding='utf-8'):
+def create_torrent_file(filename, data, encoding='utf-8', hash_fields=None):
     """
-    Shortcut function for create a torrent file using TorrentFileCreator
+    Shortcut function for create a torrent file using BEncoder
 
-    :param filename: output torrent filename
-    :param data: torrent data, must be a dict or OrderedDict
-    :param encoding: string field output encoding
+    see :any:`BDecoder.__init__` for parameter description
+
+    :param str filename: output torrent filename
+    :param dict|list|int|str|bytes data:
+    :param str encoding:
+    :param List[str] hash_fields:
     """
     with open(filename, 'wb') as f:
-        f.write(TorrentFileCreator(data, encoding).encode())
+        f.write(BEncoder(data, encoding, hash_fields).encode())
 
 
 def __main():
@@ -432,7 +605,10 @@ def __main():
                         help='ensure output json use ascii char, '
                              'escape other char use \\u')
     parser.add_argument('--coding', '-c', default='utf-8',
-                        help='string encoding, default utf-8')
+                        help='string encoding, default "utf-8"')
+    parser.add_argument('--errors', '-e', default='strict',
+                        help='decoding error handler, default "strict", you can'
+                             ' use "ignore" or "replace" to avoid exception')
     parser.add_argument('--version', '-v', action='store_true', default=False,
                         help='print version and exit')
     args = parser.parse_args()
@@ -453,7 +629,9 @@ def __main():
         exit(1)
 
     # noinspection PyUnboundLocalVariable
-    data = TorrentFileParser(target_file, not args.dict, args.coding).parse()
+    data = TorrentFileParser(
+        target_file, not args.dict, args.coding, args.errors
+    ).parse()
 
     data = json.dumps(
         data, ensure_ascii=args.ascii,

setup.cfg

@@ -1,6 +0,0 @@
-[metadata]
-description-file = README.md
-license-file = LICENSE
-
-[bdist_wheel]
-universal = 1

setup.py

@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-# coding=utf-8
-
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-import torrent_parser
-
-setup(
-    name='torrent_parser',
-    keywords=['file', 'torrent', 'JSON', 'parser'],
-    version=torrent_parser.__version__,
-    py_modules=['torrent_parser'],
-    url='https://github.com/7sDream/torrent_parser',
-    license='MIT',
-    author='7sDream',
-    author_email='7seconddream@gmail.com',
-    description='A .torrent file parser and creator for both Python 2 and 3',
-    install_requires=[],
-    entry_points={
-        'console_scripts': ['pytp=torrent_parser:__main']
-    },
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'Intended Audience :: End Users/Desktop',
-        'License :: OSI Approved :: MIT License',
-        'Natural Language :: English',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Topic :: Multimedia',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'Topic :: Utilities',
-    ]
-)

tests/__init__.py

@@ -1,2 +0,0 @@
-from .test_create import *
-from .test_parse import *

tests/test_create.py

@@ -1,31 +0,0 @@
-from __future__ import unicode_literals
-
-import collections
-import hashlib
-import io
-import os.path
-import unittest
-
-from torrent_parser import TorrentFileParser, TorrentFileCreator
-
-
-class TestCreate(unittest.TestCase):
-    TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), 'test_files')
-    REAL_FILE = os.path.join(TEST_FILES_DIR, 'real.torrent')
-
-    def test_simple_create(self):
-        data = collections.OrderedDict()
-        data['a'] = 1
-        data['b'] = 2
-        self.assertEqual(TorrentFileCreator(data).encode(), b'd1:ai1e1:bi2ee')
-
-    def test_same_output_if_no_edit(self):
-        with open(self.REAL_FILE, 'rb') as fp:
-            in_data = fp.read()
-            data = TorrentFileParser(io.BytesIO(in_data), True).parse()
-            out_data = TorrentFileCreator(data).encode()
-            m1 = hashlib.md5()
-            m1.update(in_data)
-            m2 = hashlib.md5()
-            m2.update(out_data)
-            self.assertEqual(m1.digest(), m2.digest())

tests/test_files/neg.torrent

@@ -1 +0,0 @@
-d3:negi-1ee

tests/test_parse.py

@@ -1,58 +0,0 @@
-from __future__ import unicode_literals
-
-import collections
-import os.path
-import unittest
-
-from torrent_parser import TorrentFileParser, parse_torrent_file
-
-
-class TestParse(unittest.TestCase):
-    TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), 'test_files')
-    REAL_FILE = os.path.join(TEST_FILES_DIR, 'real.torrent')
-    NEG_FILE = os.path.join(TEST_FILES_DIR, 'neg.torrent')
-
-    def test_parse_torrent_file_use_shortcut(self):
-        parse_torrent_file(self.REAL_FILE)
-
-    def test_parse_torrent_file_use_class(self):
-        with open(self.REAL_FILE, 'rb') as fp:
-            TorrentFileParser(fp).parse()
-
-    def test_encoding_auto(self):
-        with open(self.REAL_FILE, 'rb') as fp:
-            TorrentFileParser(fp, encoding='auto').parse()
-
-    def test_parse_torrent_file_to_ordered_dict(self):
-        data = parse_torrent_file(self.REAL_FILE, True)
-        self.assertIsInstance(data, collections.OrderedDict)
-
-        with open(self.REAL_FILE, 'rb') as fp:
-            data = TorrentFileParser(fp, True).parse()
-        self.assertIsInstance(data, collections.OrderedDict)
-
-    def test_parse_correctness(self):
-        data = parse_torrent_file(self.REAL_FILE)
-        self.assertIn(['udp://tracker.publicbt.com:80/announce'],
-                      data['announce-list'])
-        self.assertEqual(data['creation date'], 1409254242)
-
-    def test_parse_two_times(self):
-        with open(self.REAL_FILE, 'rb') as fp:
-            parser = TorrentFileParser(fp)
-            data = parser.parse()
-            self.assertIn(['udp://tracker.publicbt.com:80/announce'],
-                          data['announce-list'])
-            self.assertEqual(data['creation date'], 1409254242)
-            data = parser.parse()
-            self.assertIn(['udp://tracker.publicbt.com:80/announce'],
-                          data['announce-list'])
-            self.assertEqual(data['creation date'], 1409254242)
-
-    def test_int_is_negative(self):
-        data = parse_torrent_file(self.NEG_FILE)
-        self.assertEqual(data['neg'], -1)
-
-
-if __name__ == '__main__':
-    unittest.main()