Skip to content

Commit

Permalink
Cleanup after merges.
Browse files Browse the repository at this point in the history
  • Loading branch information
wagnerrp committed Jan 18, 2015
1 parent 3907100 commit 3fb9398
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
# Python stuff #
################
build
dist
tmdb3.egg-info
*.pyc
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ Caching Engine

In order to limit excessive usage against the online API server, the PyTMDB3
module supports caching of requests. Cached data is keyed off the request URL,
and is currently stored for one hour. This may get tuned further as the v3
API gets increased usage, and official limits are set per host.
and is currently stored for one hour. API requests are limited to thirty (30)
within ten (10) seconds. Requests beyond this limit are blocking until they
can be processed.

There are currently two engines available for use. The `null` engine merely
discards all information, and is only intended for debugging use. The `file`
Expand Down Expand Up @@ -303,6 +304,8 @@ List of Available Data
| list(Crew) | crew |
| list(Backdrop) | backdrops |
| list(Poster) | posters |
| list(Series) | similar |
| list(Keyword) | keywords |

#### Season:
| type | name |
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
from distutils.core import setup


with open('README') as f:
with open('README.md') as f:
long_description = f.read()

setup(
name='tmdb3',
version='0.7.1',
version='0.7.2',
description='TheMovieDB.org APIv3 interface',
long_description=long_description,
author='Raymond Wagner',
Expand Down
9 changes: 6 additions & 3 deletions tmdb3/tmdb_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
Preliminary API specifications can be found at
http://help.themoviedb.org/kb/api/about-3"""

__version__ = "v0.7.1"
__version__ = "v0.7.2"
# 0.1.0 Initial development
# 0.2.0 Add caching mechanism for API queries
# 0.2.1 Temporary work around for broken search paging
Expand Down Expand Up @@ -63,6 +63,9 @@
# releasedate sorting from Collection Movies
# 0.7.0 Add support for television series data
# 0.7.1 Add rate limiter to cache engine
# 0.7.2 Add similar and keywords to TV Series
# Fix unicode issues with search result object names
# Temporary fix for youtube videos with malformed URLs

from request import set_key, Request
from util import Datapoint, Datalist, Datadict, Element, NameRepr, SearchRepr
Expand Down Expand Up @@ -373,7 +376,7 @@ class Keyword(Element):
name = Datapoint('name')

def __repr__(self):
return u"<{0.__class__.__name__} {0.name}>"\
return u"<{0.__class__.__name__} '{0.name}'>"\
.format(self).encode('utf-8')


Expand All @@ -382,7 +385,7 @@ class Release(Element):
country = Datapoint('iso_3166_1')
releasedate = Datapoint('release_date', handler=process_date)
def __repr__(self):
return u"<{0.__class__.__name__} {0.country}, {0.releasedate}>"\
return u"<{0.__class__.__name__} '{0.country}', {0.releasedate}>"\
.format(self).encode('utf-8')


Expand Down

0 comments on commit 3fb9398

Please sign in to comment.