This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/tictactoe/apps/core/views.py b/tictactoe/apps/core/views.py | |
| index 9da2f0e..edfaf4b 100644 | |
| --- a/tictactoe/apps/core/views.py | |
| +++ b/tictactoe/apps/core/views.py | |
| @@ -113,21 +113,9 @@ def _get_computer(): | |
| def create_computer_game(request): | |
| bot = _get_computer() | |
| - coin_toss = random.choice([0, 1]) | |
| - |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Personality/ ability to reason: | |
| which one doesn't fit and why: boulder builder beaver |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/medley/videos/admin.py b/medley/videos/admin.py | |
| index 04f7250..6260441 100644 | |
| --- a/medley/videos/admin.py | |
| +++ b/medley/videos/admin.py | |
| @@ -17,7 +17,7 @@ class VideoAdmin(MedleyBaseModelAdmin): | |
| prepopulated_fields = {"slug": ('title',),} | |
| list_display = ('title', 'pub_date', 'primary_category', 'originating_site', 'status',) | |
| list_filter = ('sites', 'pub_date', 'status', 'comment_status', 'categories', ) | |
| - search_fields = ('player_url', 'title',) | |
| + search_fields = ('player_url', 'title', 'description', 'topics__tag__name') |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/medley/playlist/tests/tests.py b/medley/playlist/tests/tests.py | |
| index 4cf9bcd..d20c8e5 100644 | |
| --- a/medley/playlist/tests/tests.py | |
| +++ b/medley/playlist/tests/tests.py | |
| @@ -273,6 +273,7 @@ class APITestCase(TestCase): | |
| # - Setting object (for cache timeout) | |
| self.client.get('/lsp/_api/v1/stream/?format=json') | |
| + print connection.queries | |
| self.assertEqual(5, len(connection.queries)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| def get_required_databases(suite): | |
| """ given a test suite, return all the databases that | |
| these testcase-classes publish as requirements | |
| """ | |
| required_databases = [] | |
| for testclass in set([x.__class__ for x in suite._tests]): | |
| required_databases.extend(db_requirements(testclass) | |
| return list(set(required_databases)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/storyville/conf/local.py b/storyville/conf/local.py | |
| index ad32f1e..769f4fb 100644 | |
| --- a/storyville/conf/local.py | |
| +++ b/storyville/conf/local.py | |
| @@ -25,6 +25,13 @@ DATABASES['strongmail'].update({ | |
| 'TEST_NAME': '%s' % STRONGMAIL_DB_NAME, | |
| }) | |
| +DATABASES['amgdb'].update({ | |
| + #'NAME': 'amgdb', |
NewerOlder