Merge branch 'release/2.12.0'

fuzeman · Jan 11, 2017 · 2b6bfd3 · 2b6bfd3
2 parents 67b638a + 4417d7d
commit 2b6bfd3
Show file tree

Hide file tree

Showing 42 changed files with 1,615 additions and 1,382 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,33 @@
+2.12.0 (2017-01-11)
+-------------------
+**Added**
+ - Improved token refreshing *(and added the "oauth.refresh" and "oauth.refresh.rejected" events)*
+ - `RequestFailedError` exception will now be raised if no response was returned (if `exceptions=True`)
+ - :code:`Trakt.http.keep_alive` property *(defaults to :code:`True`)*
+ - :code:`Trakt.http.ssl_version` property *(defaults to :code:`None` / :code:`PROTOCOL_TLS` / :code:`PROTOCOL_SSLv23`)*
+
+**Changed**
+ - Switched default API endpoint to https://api.trakt.tv
+ - SSL protocol version is now automatically negotiated with the server *(instead of defaulting to TLS v1.0)*
+ - Warning will now be displayed if a deadlock is detected inside token refresh events
+ - Fixed some inconsistencies in the handling of error responses
+ - Updated bundled emitter module (fuzeman/PyEmitter@3c558c7c2bc3ae07cb1e8e18b2c1c16be042c748)
+ - Interfaces:
+     - :code:`Trakt['search']`
+         - Updated to use the new search endpoints
+ - Methods:
+     - :code:`Trakt['search'].lookup`
+        - Now supports the :code:`extended` parameter
+     - :code:`Trakt['search'].query`
+        - Now supports the :code:`fields` and :code:`extended` parameters
+
+**Fixed**
+ - :code:`@authenticated` decorator wasn't applied to some methods, resulting in tokens not being refreshed
+ - Exception raised when :code:`Trakt['scrobble']` methods are provided "app_version" or "app_date" parameters
+ - Error responses weren't being returned correctly with :code:`parse=False`
+ - Issue handling :code:`None` responses in the automatic token refresher
+ - Inconsistent handling of error responses in some methods
+
 2.11.0 (2016-12-20)
 -------------------
 **Added**

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,7 +1,3 @@
-Quickstart
-==========
-
-
 Learn More
 ================
 

diff --git a/tests/fixtures/search/episode/Breaking Bad.json b/tests/fixtures/search/episode/Breaking Bad.json
@@ -0,0 +1,282 @@
+[
+  {
+    "type": "episode",
+    "score": 120.28289,
+    "episode": {
+      "season": 5,
+      "number": 4,
+      "title": "Pope Breaks Bad",
+      "ids": {
+        "trakt": 1532771,
+        "tvdb": 5212146,
+        "imdb": "tt4164812",
+        "tmdb": 1074560,
+        "tvrage": 1065821312
+      }
+    },
+    "show": {
+      "title": "Falling Skies",
+      "year": 2011,
+      "ids": {
+        "trakt": 34818,
+        "slug": "falling-skies",
+        "tvdb": 205281,
+        "imdb": "tt1462059",
+        "tmdb": 34967,
+        "tvrage": 26205
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 23.962301,
+    "episode": {
+      "season": 2013,
+      "number": 10,
+      "title": "Breaking Bad Special",
+      "ids": {
+        "trakt": 76330,
+        "tvdb": 4575924,
+        "imdb": null,
+        "tmdb": 0,
+        "tvrage": null
+      }
+    },
+    "show": {
+      "title": "MythBusters",
+      "year": 2003,
+      "ids": {
+        "trakt": 1419,
+        "slug": "mythbusters",
+        "tvdb": 73388,
+        "imdb": "tt0383126",
+        "tmdb": 1428,
+        "tvrage": 4605
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 21.605352,
+    "episode": {
+      "season": 2,
+      "number": 4,
+      "title": "Charlie's Dad Breaks Bad",
+      "ids": {
+        "trakt": 890052,
+        "tvdb": 4453126,
+        "imdb": "tt2573086",
+        "tmdb": 883071,
+        "tvrage": 0
+      }
+    },
+    "show": {
+      "title": "Anger Management",
+      "year": 2012,
+      "ids": {
+        "trakt": 42652,
+        "slug": "anger-management",
+        "tvdb": 253350,
+        "imdb": "tt1986770",
+        "tmdb": 42878,
+        "tvrage": null
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 3.5197084,
+    "episode": {
+      "season": 1,
+      "number": 1,
+      "title": "Breaking Bad",
+      "ids": {
+        "trakt": 1198313,
+        "tvdb": 4607734,
+        "imdb": null,
+        "tmdb": null,
+        "tvrage": null
+      }
+    },
+    "show": {
+      "title": "The Writers' Room",
+      "year": 2013,
+      "ids": {
+        "trakt": 71683,
+        "slug": "the-writers-room",
+        "tvdb": 271327,
+        "imdb": "tt3059532",
+        "tmdb": null,
+        "tvrage": null
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 1.7284282,
+    "episode": {
+      "season": 12,
+      "number": 1,
+      "title": "Breaking Bad Girls",
+      "ids": {
+        "trakt": 1578247,
+        "tvdb": 4858421,
+        "imdb": null,
+        "tmdb": 1116839,
+        "tvrage": 0
+      }
+    },
+    "show": {
+      "title": "Bad Girls Club",
+      "year": 2006,
+      "ids": {
+        "trakt": 4914,
+        "slug": "bad-girls-club",
+        "tvdb": 134161,
+        "imdb": "tt0914829",
+        "tmdb": 4940,
+        "tvrage": 14714
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 1.4575909,
+    "episode": {
+      "season": 8,
+      "number": 16,
+      "title": "Bad Crazy",
+      "ids": {
+        "trakt": 67719,
+        "tvdb": 4473865,
+        "imdb": "tt2676388",
+        "tmdb": 62941,
+        "tvrage": 0
+      }
+    },
+    "show": {
+      "title": "How I Met Your Mother",
+      "year": 2005,
+      "ids": {
+        "trakt": 1095,
+        "slug": "how-i-met-your-mother",
+        "tvdb": 75760,
+        "imdb": "tt0460649",
+        "tmdb": 1100,
+        "tvrage": 3918
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 1.2199193,
+    "episode": {
+      "season": 5,
+      "number": 16,
+      "title": "Felina",
+      "ids": {
+        "trakt": 73543,
+        "tvdb": 4553042,
+        "imdb": "tt2301455",
+        "tmdb": 62161,
+        "tvrage": 0
+      }
+    },
+    "show": {
+      "title": "Breaking Bad",
+      "year": 2008,
+      "ids": {
+        "trakt": 1388,
+        "slug": "breaking-bad",
+        "tvdb": 81189,
+        "imdb": "tt0903747",
+        "tmdb": 1396,
+        "tvrage": 18164
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 1.0844237,
+    "episode": {
+      "season": 5,
+      "number": 14,
+      "title": "Ozymandias",
+      "ids": {
+        "trakt": 73541,
+        "tvdb": 4553040,
+        "imdb": "tt2301451",
+        "tmdb": 62162,
+        "tvrage": 0
+      }
+    },
+    "show": {
+      "title": "Breaking Bad",
+      "year": 2008,
+      "ids": {
+        "trakt": 1388,
+        "slug": "breaking-bad",
+        "tvdb": 81189,
+        "imdb": "tt0903747",
+        "tmdb": 1396,
+        "tvrage": 18164
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 1.0452855,
+    "episode": {
+      "season": 1,
+      "number": 1,
+      "title": "Pilot",
+      "ids": {
+        "trakt": 73482,
+        "tvdb": 349232,
+        "imdb": "tt0959621",
+        "tmdb": 62085,
+        "tvrage": 637041
+      }
+    },
+    "show": {
+      "title": "Breaking Bad",
+      "year": 2008,
+      "ids": {
+        "trakt": 1388,
+        "slug": "breaking-bad",
+        "tvdb": 81189,
+        "imdb": "tt0903747",
+        "tmdb": 1396,
+        "tvrage": 18164
+      }
+    }
+  },
+  {
+    "type": "episode",
+    "score": 0.97547776,
+    "episode": {
+      "season": 5,
+      "number": 13,
+      "title": "To'hajiilee",
+      "ids": {
+        "trakt": 73540,
+        "tvdb": 4553039,
+        "imdb": "tt2301449",
+        "tmdb": 62157,
+        "tvrage": 0
+      }
+    },
+    "show": {
+      "title": "Breaking Bad",
+      "year": 2008,
+      "ids": {
+        "trakt": 1388,
+        "slug": "breaking-bad",
+        "tvdb": 81189,
+        "imdb": "tt0903747",
+        "tmdb": 1396,
+        "tvrage": 18164
+      }
+    }
+  }
+]
diff --git a/tests/fixtures/search/imdb/tt0848228.json b/tests/fixtures/search/imdb/tt0848228.json
@@ -0,0 +1,65 @@
+[
+  {
+    "movie": {
+      "available_translations": [
+        "bg",
+        "cs",
+        "da",
+        "de",
+        "el",
+        "en",
+        "es",
+        "fa",
+        "fi",
+        "fr",
+        "he",
+        "hr",
+        "hu",
+        "id",
+        "it",
+        "ja",
+        "ko",
+        "lv",
+        "nl",
+        "no",
+        "pl",
+        "pt",
+        "ro",
+        "ru",
+        "sk",
+        "sv",
+        "th",
+        "tr",
+        "uk",
+        "vi",
+        "zh"
+      ],
+      "certification": "PG-13",
+      "genres": [
+        "action",
+        "adventure",
+        "science-fiction"
+      ],
+      "homepage": "http://marvel.com/avengers_movie/",
+      "ids": {
+        "imdb": "tt0848228",
+        "slug": "the-avengers-2012",
+        "tmdb": 24428,
+        "trakt": 14701
+      },
+      "language": "en",
+      "overview": "When an unexpected enemy emerges and threatens global safety and security, Nick Fury, director of the international peacekeeping agency known as S.H.I.E.L.D., finds himself in need of a team to pull the world back from the brink of disaster. Spanning the globe, a daring recruitment effort begins!",
+      "rating": 8.30991,
+      "released": "2012-05-04",
+      "runtime": 143,
+      "tagline": "Some assembly required.",
+      "title": "The Avengers",
+      "trailer": "http://youtube.com/watch?v=hIR8Ar-Z4hw",
+      "updated_at": "2016-12-31T09:19:16.000Z",
+      "votes": 26269,
+      "year": 2012
+    },
+    "score": null,
+    "type": "movie"
+  }
+]