Merge branch 'develop' into feature/calendar-object

pymal/__init__.py

@@ -6,5 +6,4 @@
 __all__ = ['account', 'anime', 'manga', 'seasons']
 
 
-def get_version():
-    return '0.5b4'
+__version__ = '0.6'

pymal/account.py

@@ -24,7 +24,7 @@ class Account(object, metaclass=singleton_factory.SingletonFactory):
         request.urljoin(HOST_NAME, r'api/account/verify_credentials.xml')
 
     __MY_LOGIN_URL = request.urljoin(HOST_NAME, 'login.php')
-    __DATA_FORM = 'username={0:s}&password={1:s}&cookie=1&sublogin=Login'
+    __DATA_FORM = 'username={0:s}&password={1:s}&cookie=1&sublogin=+Login+'
 
     def __init__(self, username: str, password: str or None=None):
         """
@@ -178,7 +178,12 @@ def change_password(self, password: str) -> bool:
         self.__password = password
 
         data_form = self.__DATA_FORM.format(self.username, password).encode('utf-8')
-        self.connect(self.__MY_LOGIN_URL, data=data_form)
+        headers = {
+            'content-type': 'application/x-www-form-urlencoded',
+            'name': 'loginForm',
+        }
+
+        self.auth_connect(self.__MY_LOGIN_URL, data=data_form, headers=headers)
 
         return True
 

pymal/account_objects/account_animes.py

@@ -130,7 +130,10 @@ def reload(self):
     def __get_my_animes(self, status: int) -> frozenset:
         import bs4
 
-        data = self.__account.connect(self.__url + str(status))
+        if self.__account.is_auth:
+            data = self.__account.auth_connect(self.__url + str(status))
+        else:
+            data = self.__account.connect(self.__url + str(status))
         body = bs4.BeautifulSoup(data).body
 
         main_div = body.find(name='div', attrs={'id': 'list_surround'})

pymal/account_objects/account_mangas.py

@@ -130,7 +130,10 @@ def reload(self):
     def __get_my_animes(self, status: int) -> frozenset:
         import bs4
 
-        data = self.__account.connect(self.__url + str(status))
+        if self.__account.is_auth:
+            data = self.__account.auth_connect(self.__url + str(status))
+        else:
+            data = self.__account.connect(self.__url + str(status))
         body = bs4.BeautifulSoup(data).body
 
         main_div = body.find(name='div', attrs={'id': 'list_surround'})

requirements.txt

@@ -1,12 +1,16 @@
 # This is an implicit value, here for clarity
 --index-url https://pypi.python.org/simple/
 
+# Those are like in setup.py
 beautifulsoup4>=4.3.2
 html5lib>=0.999
 httpcache>=0.1.3
-coveralls>=0.4.2
 six==1.3
 requests>=2.4.1
 pillow>=2.5.3
 singleton3>=1.0
 singleton-factory>=0.1
+
+# This is needed for tests
+coveralls>=0.4.2
+mock==1.0.1

setup.py

@@ -1,8 +1,8 @@
 from setuptools import setup, find_packages
 
 
-# Dynamically calculate the version based on pymal.VERSION.
-version = __import__('pymal').get_version()
+# Dynamically calculate the version based on pymal.__version__.
+version = __import__('pymal').__version__
 
 
 setup(

tests/account_objects/test_account_animes.py

@@ -79,6 +79,7 @@ def test_issubset(self):
         operator = self.animes <= self.friend_animes
         self.assertEqual(regular, operator)
 
+    @unittest.skip('need to re think about this')
     def test_issuperset(self):
         regular = self.animes.issubset(self.friend_animes)
         operator = self.animes >= self.friend_animes

tests/test_anime.py

@@ -1,8 +1,9 @@
 import unittest
-from unittest.mock import Mock
 import os
 from os import path
 
+from mock import Mock
+
 from pymal import account
 from pymal import anime
 from pymal import manga