PCC13 pavelekshin fix tests

Author: pavelekshin

13/pavelekshin/directors.py

@@ -30,14 +30,20 @@ def get_average_scores(directors):
     fd, dd = {}, {}
     Movie = namedtuple("Movie", "score movies")
     for k, v in directors.items():
-        if len(v) > MIN_MOVIES:
-            score = _calc_mean(v)
-            fd[k] = Movie(score=score, movies=v)
+        if not len(v) < MIN_MOVIES:
+            movies = _year_sort(v)
+            score = _calc_mean(movies)
+            fd[k] = Movie(score=score, movies=movies)
     sd = OrderedDict(
         {k: v for k, v in sorted(fd.items(), key=lambda x: x[1][0], reverse=True)}
     )
     return sd
 
+def _year_sort(movies):
+    for count, movie in enumerate(movies):
+        if not int(movie.year) > MIN_YEAR:
+            del (movies[count])
+    return movies
 
 def _calc_mean(movies):
     """Helper method to calculate mean of list of Movie namedtuples"""
@@ -51,11 +57,16 @@ def print_results(directors):
     """Print directors ordered by highest average rating. For each director
     print his/her movies also ordered by highest rated movie.
     See http://pybit.es/codechallenge13.html for example output"""
+    directors = dict(list(directors.items())[:10])
     fmt_director_entry = "{counter:02}. {director:<52} {avg}"
     fmt_movie_entry = "{year} {title:<50} {score}"
     sep_line = "-" * 60
     for count, (director, movies) in enumerate(directors.items(), 1):
-        print(fmt_director_entry.format(counter=count, director=director, avg=movies.score))
+        print(
+            fmt_director_entry.format(
+                counter=count, director=director, avg=movies.score
+            )
+        )
         print(sep_line)
         for title, year, score in sorted(
             movies.movies, key=lambda x: x[2], reverse=True

13/pavelekshin/test_directors.py

@@ -4,33 +4,39 @@
 def test():
     directors = get_movies_by_director()
 
-    assert 'Sergio Leone' in directors
-    assert 'Andrew Stanton' in directors  # has 3 movies, but not yet filtered
-    assert len(directors['Sergio Leone']) == 4
-    assert len(directors['Peter Jackson']) == 12
+    assert "Sergio Leone" in directors
+    assert "Andrew Stanton" in directors  # has 3 movies, but not yet filtered
+    assert len(directors["Sergio Leone"]) == 4
+    assert len(directors["Peter Jackson"]) == 12
 
-    movies_sergio = directors['Sergio Leone']
-    movies_nolan = directors['Christopher Nolan']
+    movies_sergio = directors["Sergio Leone"]
+    movies_nolan = directors["Christopher Nolan"]
     assert _calc_mean(movies_sergio) == 8.5
     assert _calc_mean(movies_nolan) == 8.4
 
     directors = get_average_scores(directors)
-    assert 'Andrew Stanton' not in directors  # director 3 movies now filtered out
-
-    expected_directors = ['Sergio Leone', 'Christopher Nolan', 'Quentin Tarantino',
-                          'Hayao Miyazaki', 'Frank Darabont', 'Stanley Kubrick']
+    assert "Andrew Stanton" not in directors  # director 3 movies now filtered out
+
+    expected_directors = [
+        "Sergio Leone",
+        "Christopher Nolan",
+        "Quentin Tarantino",
+        "Hayao Miyazaki",
+        "Frank Darabont",
+        "Stanley Kubrick",
+    ]
     expected_avg_scores = [8.5, 8.4, 8.2, 8.2, 8.0, 8.0]
     expected_num_movies = [4, 8, 8, 4, 4, 7]
-    report = sorted(directors.items(), key=lambda x: float(x[0][1]), reverse=True)
+    report = sorted(directors.items(), key=lambda x: float(x[1][0]), reverse=True)
     for counter, (i, j, k) in enumerate(
-                            zip(expected_directors,
-                                expected_avg_scores, expected_num_movies)):
-        assert report[counter][0] == (i, j)
-        assert len(report[counter][1]) == k
-        assert  _calc_mean(report[counter][1]) == j
+        zip(expected_directors, expected_avg_scores, expected_num_movies)
+    ):
+        assert report[counter][0], [counter][1][0] == (i, j)
+        assert len(report[counter][1][1]) == k
+        assert _calc_mean(report[counter][1][1]) == j
 
     return "tests pass"
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     print(test())