Merge branch 'master' into stable

futapi · Jan 26, 2014 · ecfb3ee · ecfb3ee
2 parents 59a9739 + de7e476
commit ecfb3ee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ log.log
 content.log
 error.log
 fut14.log
+test.log
diff --git a/fut14/__init__.py b/fut14/__init__.py
@@ -18,7 +18,7 @@
 """
 
 __title__ = 'fut14'
-__version__ = '0.0.8'
+__version__ = '0.0.9'
 __author__ = 'Piotr Staroszczyk'
 __author_email__ = 'piotr.staroszczyk@get24.org'
 __license__ = 'GNU GPL v3'

diff --git a/fut14/core.py b/fut14/core.py
@@ -291,6 +291,7 @@ def searchAuctions(self, ctype, level=None, category=None, assetId=None,
                        playStyle=None, start=0, page_size=16):
         """Search specific items on transfer market."""
         # TODO: add "search" alias
+        # TODO: generator
         if start > 0 and page_size == 16:
             page_size = 13
         elif page_size > 50:  # server restriction
@@ -380,7 +381,8 @@ def sendToClub(self, trade_id, item_id):
 
     def relist(self):
         """Relist all tradepile."""
-        self.__post__(self.urls['fut']['SearchAuctionsReListItem'])
+        # TODO: return relisted ids
+        self.__put__(self.urls['fut']['SearchAuctionsReListItem'])
         #{"tradeIdList":[{"id":139632781208},{"id":139632796467}]}
         return True
 

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