util.py HTMLParser deprecation fix

also:
- some minimal PEP8 standartizations
- update dead 8chan urls
- update version according to docs/conf.py

Author: KebabLord

README.rst

@@ -33,8 +33,8 @@ Usage
 .. code:: python
 
     import pyvichan
-    v = pyvichan.Board('v', '8ch.pl')
-    thread = v.get_thread(462)
+    v = pyvichan.Board('v', '8kun.top')
+    thread = v.get_thread(16959924)
 
     print(thread)
 

docs/conf.py

@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.2'
+version = '0.4.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.2'
+release = '0.4.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

examples/example2.py

@@ -1,5 +1,6 @@
 # credits to Anarov for improved example.py
 from __future__ import print_function
+import sys
 import pyvichan
 
 def main():

examples/example3.py

@@ -1,7 +1,7 @@
 # credits to Anarov for improved example.py
 import pyvichan
 
-b = pyvichan.Board('b')
+b = pyvichan.Board('v')
 threads = b.get_threads()
 print("Got %i threads" % len(threads))
 first_thread = threads[0]

examples/example6-download-thread.py

@@ -1,10 +1,11 @@
 # example6-download-thread.py - download json and all full-size images from a thread
 from __future__ import print_function
-import pyvichan
 import sys
 import os
-import requests
 import json
+import requests
+
+import pyvichan
 
 def mkdirs(path):
     """Make directory, if it doesn't exist."""
@@ -43,14 +44,14 @@ def main():
         print("%s - Save the JSON and all images for an 8chan post." % (sys.argv[0]))
         print("\tUsage: %s <board> <thread_id>" % (sys.argv[0]))
         sys.exit(1)
-    
+
     board_name = sys.argv[1]
     thread_id = sys.argv[2]
-    
+
     # grab the first thread on the board by checking first page
     board = pyvichan.Board(board_name)
     thread = board.get_thread(thread_id)
-    
+
     # create folders according to chan.arc standard
     path = os.path.join(os.getcwd(), "8chan", board_name, thread_id)
     images_path = os.path.join(path, "images")

pyvichan/__init__.py

@@ -12,10 +12,10 @@
 information quickly and easily.
 """
 
-__version__ = '0.0.1'
+__version__ = '0.4.3'
 
 from .board import Board, board, get_boards, get_all_boards
 from .url import Url
 from .thread import Thread
 from .post import Post
-from .file import File
+from .file import File

pyvichan/board.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import requests
-
 from . import __version__
 from .thread import Thread
 from .url import Url
 
 # default site URL
-_SITE_URL = '8ch.pl'
+_SITE_URL = '8kun.top'
 
 # cached metadata for boards
 _metadata = {}
@@ -56,7 +55,6 @@ def get_boards(board_name_list, *args, **kwargs):
         board_name_list = board_name_list.split()
     return [Board(name, *args, **kwargs) for name in board_name_list]
 
-
 # TODO: Fix this board lister for vichan
 def get_all_boards(*args, **kwargs):
     """Returns every board on 4chan.
@@ -262,7 +260,7 @@ def clear_cache(self):
         """Remove everything currently stored in our cache."""
         self._thread_cache.clear()
 
-    # root site URL provided by the user, such as `8ch.pl`
+    # root site URL provided by the user, such as `8kun.top`
     @property
     def site_url(self):
         return self._site_url

pyvichan/url.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # default site URL
-_SITE_URL = '8ch.pl'
+_SITE_URL = '8kun.top'
 
 # 8chan URL generator. Inherit and override this for derivative classes  (e.g. 420chan API, 8chan/vichan API)
 class Url(object):
@@ -11,7 +11,7 @@ def __init__(self, board, https=False, site_url=_SITE_URL):
         self._board = board
         self._protocol = 'https://' if https else 'http://'
         self._site_url = site_url
-        #self._site_url = "8ch.pl"
+        #self._site_url = "8kun.top"
 
 
         # Examples

pyvichan/util.py

@@ -4,13 +4,16 @@
 
 import re
 
-# HTML parser was renamed in python 3.x
+# HTMLParser was deprecated since 3.4
 try:
-    from html.parser import HTMLParser
+    from html import unescape
 except ImportError:
-    from HTMLParser import HTMLParser
-
-_parser = HTMLParser()
+    try:
+        from html.parser import HTMLParser
+    except ImportError:
+        from HTMLParser import HTMLParser
+    _parser = HTMLParser()
+    unescape = _parser.unescape
 
 
 def clean_comment_body(body):
@@ -19,7 +22,7 @@ def clean_comment_body(body):
     Converts all HTML tags and entities within 4chan comments
     into human-readable text equivalents.
     """
-    body = _parser.unescape(body)
+    body = unescape(body)
     body = re.sub(r'<a [^>]+>(.+?)</a>', r'\1', body)
     body = body.replace('<br>', '\n')
     body = re.sub(r'<.+?>', '', body)

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='vichan',
-    version='0.0.1',
+    version='0.4.3',
     description=("Python vichan API Wrapper. Based on BASC-py4chan by the Bbiliotheca Anonoma"),
     long_description=open('README.rst').read(),
     license=open('LICENSE').read(),