Merge branch 'master' into stable

futapi · Aug 31, 2014 · 97808fd · 97808fd
2 parents 21a9fd4 + 73ca876
commit 97808fd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -17,3 +17,4 @@ Patches and Suggestions
 - mvillarejo
 - Mauro Marano
 - Innursery
+- Arthur Nogueira Neves @arthurnn
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,19 @@ Changelog
 ---------
 
 
+0.0.16 (2014-08-31)
+++++++++++++++++++
+* #76 fix buying (thanks to arthurnn)
+
+
+0.0.15 (2014-08-29)
+++++++++++++++++++
+* add new exceptions: doLoginFail, MaxSessions, Captcha
+* add changelog
+* NullHandler is default logging handler
+* core: bump clientVersion (8->9)
+
+
 0.0.14 (2014-07-06)
 ++++++++++++++++++
 

diff --git a/README.rst b/README.rst
@@ -25,7 +25,7 @@ Usage
     >>> import fut14
     >>> fut = fut14.Core('email', 'password', 'secret answer', platform='xbox', emulate='and', debug=True)
     >>> # PLATFORM: pc / ps3 / xbox / and / ios     (pc default)
-    >>> # EMULATE: and / ios (use this feature to avoid webapp errors [feature disabled])
+    >>> # EMULATE: and / ios (use this feature to avoid webapp errors [BE WARE IT'S HIGH RISK])
     >>> # DEBUG: save http response to fut14.log)
 
     >>> items = fut.searchAuctions('development',  # search items

diff --git a/fut14/__init__.py b/fut14/__init__.py
@@ -18,7 +18,7 @@
 """
 
 __title__ = 'fut14'
-__version__ = '0.0.15'
+__version__ = '0.0.16'
 __author__ = 'Piotr Staroszczyk'
 __author_email__ = 'piotr.staroszczyk@get24.org'
 __license__ = 'GNU GPL v3'

diff --git a/fut14/core.py b/fut14/core.py
@@ -375,7 +375,7 @@ def searchAuctions(self, ctype, level=None, category=None, assetId=None,
 
     def bid(self, trade_id, bid):
         """Make a bid."""
-        rc = self.__get__(self.urls['fut']['PostBid'], params={'tradeIds': trade_id})['auctionInfo'][0]
+        rc = self.__get__(self.urls['fut']['TradeStatus'], params={'tradeIds': trade_id})['auctionInfo'][0]
         if rc['currentBid'] < bid and self.credits >= bid:
             data = {'bid': bid}
             url = '{0}/{1}/bid'.format(self.urls['fut']['PostBid'], trade_id)

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 
 __title__ = 'fut14'
-__version__ = '0.0.15'
+__version__ = '0.0.16'
 __author__ = 'Piotr Staroszczyk'
 __author_email__ = 'piotr.staroszczyk@get24.org'
 __license__ = 'GNU GPL v3'