Removed dependency on MechanicalSoup (solves #47)

Author: tomasbedrich

README.rst

@@ -46,8 +46,9 @@ Pycaching has following requirements:
 .. code::
 
   Python>=3.4
-  MechanicalSoup>=0.3.0
-  geopy>=1.0.0
+  requests >= 2.8
+  beautifulsoup4 >= 4.4
+  geopy>=1.11
 
 
 -------------

pycaching/geo.py

@@ -312,7 +312,7 @@ def _download_utfgrid(self, *, get_png=False):
     def load(self):
         """Parse cache coordinates from UTFGrid
 
-        Consume json-decoded UTFGrid data from MechanicalSoup browser.
+        Consume json-decoded UTFGrid data from browser.
         Calculate waypoint coordinates and fill caches' location.
 
         Geocaching.com UTFGrids do not follow UTFGrid specification [2]

pycaching/geocaching.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
 
 import logging
-import requests
 import datetime
+import requests
+import bs4
 from urllib.parse import urljoin
-from mechanicalsoup import Browser
-from bs4 import BeautifulSoup
 from pycaching.cache import Cache, Type, Size
 from pycaching.log import Log, Type as LogType
 from pycaching.geo import Point
@@ -25,7 +24,7 @@ class Geocaching(object):
 
     def __init__(self):
         self._logged_in = False
-        self._browser = Browser()
+        self._session = requests.Session()
 
     def _request(self, url, *, expect="soup", method="GET", login_check=True, **kwargs):
         # check login unless explicitly turned off
@@ -35,12 +34,12 @@ def _request(self, url, *, expect="soup", method="GET", login_check=True, **kwar
         url = url if "//" in url else urljoin(self._baseurl, url)
 
         try:
-            res = self._browser.request(method, url, **kwargs)
+            res = self._session.request(method, url, **kwargs)
             res.raise_for_status()
 
             # return bs4.BeautifulSoup, JSON dict or raw requests.Response
             if expect == "soup":
-                return res.soup
+                return bs4.BeautifulSoup(res.text, "html.parser")
             elif expect == "json":
                 return res.json()
             elif expect == "raw":
@@ -99,17 +98,17 @@ def login(self, username, password):
     def logout(self):
         """Logs out the user.
 
-        Logs out the user by creating new browser."""
+        Logs out the user by creating new session."""
 
         logging.info("Logging out.")
         self._logged_in = False
-        self._browser = Browser()
+        self._session = requests.Session()
 
     def get_logged_user(self, login_page=None):
         """Returns the name of curently logged user or None, if no user is logged in."""
 
         login_page = login_page or self._request(self._urls["login_page"], login_check=False)
-        assert isinstance(login_page, BeautifulSoup)
+        assert isinstance(login_page, bs4.BeautifulSoup)
 
         logging.debug("Checking for already logged user.")
         try:
@@ -193,7 +192,7 @@ def _search_get_page(self, point, start_index):
                 "originTreatment": 0
             }, expect="json")
 
-            return BeautifulSoup(res["HtmlString"].strip())
+            return bs4.BeautifulSoup(res["HtmlString"].strip(), "html.parser")
 
     def search_quick(self, area, *, strict=False, zoom=None):
         logging.info("Searching quick in {}".format(area))
@@ -228,7 +227,8 @@ def post_log(self, wp, text, type=LogType.found_it, date=datetime.date.today()):
         l = Log(type=type, text=text, visited=date)
         self.get_cache(wp).post_log(l)
 
-    #  ensure backwards compatibility -----------------------------------------
+    # ensure backwards compatibility ------------------------------------------
+    # deprecated methods will be removed in next version!
 
     @deprecated
     def load_cache(self, wp):

setup.py

@@ -9,7 +9,7 @@
 
 info = {
     "name":                "pycaching",
-    "version":             "3.3",  # PEP 386
+    "version":             "3.3.1",  # PEP 386
     "author":              "Tomas Bedrich",
     "author_email":        "[email protected]",
     "url":                 "https://github.com/tomasbedrich/pycaching",
@@ -19,7 +19,7 @@
     "description":         "Geocaching.com site crawler. Provides tools for searching, fetching caches and geocoding.",
     "long_description":    long_description,
     "keywords":            ["geocaching", "crawler", "geocache", "cache", "search", "geocode", "travelbug"],
-    "install_requires":    ["MechanicalSoup >= 0.3.0", "geopy >= 1.0.0"],
+    "install_requires":    ["requests >= 2.8", "beautifulsoup4 >= 4.4", "geopy >= 1.11"],
     "test_suite":          "test"
 }