Skip to content

Commit

Permalink
Fix (some) pylint violations.
Browse files Browse the repository at this point in the history
I'm leaving many of these errors to be resolved when we've got a
solution for course search.
  • Loading branch information
Peter Fogg committed Mar 21, 2016
1 parent c147169 commit 7ed5e4a
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions course_discovery/apps/api/v1/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def test_courses(self):

def test_contains(self):
""" Verify the endpoint returns a filtered list of courses contained in the catalog. """
course_id = self.course.id
course_id = self.course.id # pylint: disable=no-member
qs = urllib.parse.urlencode({'course_id': course_id})
url = '{}?{}'.format(reverse('api:v1:catalog-contains', kwargs={'id': self.catalog.id}), qs)

Expand Down Expand Up @@ -300,7 +300,7 @@ def test_retrieve(self):
def assert_retrieve_success(self, **headers):
""" Asserts the endpoint returns details for a single course. """
course = CourseFactory()
url = reverse('api:v1:course-detail', kwargs={'id': course.id})
url = reverse('api:v1:course-detail', kwargs={'id': course.id}) # pylint: disable=no-member
response = self.client.get(url, format='json', **headers)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data, self.serialize_course(course))
Expand Down
6 changes: 3 additions & 3 deletions course_discovery/apps/api/v1/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ def get_queryset(self):

def get_data(self, limit=None, offset=None):
""" Return all courses. """
query = self.request.GET.get('q', None)
limit = 1000 if limit is None else limit
query = self.request.GET.get('q', None)
limit = 1000 if limit is None else limit
offset = 0 if offset is None else offset
slice_start = offset
slice_end = offset + limit
slice_end = offset + limit

if query:
query = json.loads(query)
Expand Down
2 changes: 1 addition & 1 deletion course_discovery/apps/catalogs/tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ def test_courses(self):
def test_contains(self):
""" Verify the method returns a mapping of course IDs to booleans. """
other_id = 'd/e/f'
self.assertDictEqual(self.catalog.contains([self.course.id, other_id]), {self.course.id: True, other_id: False})
self.assertDictEqual(self.catalog.contains([self.course.id, other_id]), {self.course.id: True, other_id: False}) # pylint: disable=no-member
50 changes: 24 additions & 26 deletions course_discovery/apps/course_metadata/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ class Course(TimeStampedModel):
"""
Course model.
"""
key = models.CharField(max_length=255)
name = models.CharField(max_length=255)
key = models.CharField(max_length=255)
name = models.CharField(max_length=255)
organizations = models.ManyToManyField('Organization', through='CourseOrganization')


class CourseRun(TimeStampedModel):
"""
CourseRun model.
"""
key = models.CharField(max_length=255)
key = models.CharField(max_length=255)
course = models.ForeignKey(
Course,
db_index=True,
Expand Down Expand Up @@ -49,19 +49,19 @@ class Image(TimeStampedModel):
"""
Image model.
"""
height = models.IntegerField()
width = models.IntegerField()
src = models.CharField(max_length=255)
height = models.IntegerField()
width = models.IntegerField()
src = models.CharField(max_length=255)
description = models.CharField(max_length=255)


class Video(TimeStampedModel):
"""
Video model.
"""
image = models.ForeignKey(Image)
type = models.CharField(max_length=255)
src = models.CharField(max_length=255)
image = models.ForeignKey(Image)
type = models.CharField(max_length=255)
src = models.CharField(max_length=255)
description = models.CharField(max_length=255)


Expand All @@ -77,75 +77,73 @@ class LevelType(TimeStampedModel):
"""
LevelType model.
"""
name = models.CharField(max_length=255)
name = models.CharField(max_length=255)


class PacingType(TimeStampedModel):
"""
PacingType model.
"""
name = models.CharField(max_length=255)
name = models.CharField(max_length=255)


class Subject(TimeStampedModel):
"""
Subject model.
"""
course = models.ManyToManyField(Course)
name = models.CharField(max_length=255)
name = models.CharField(max_length=255)


class Prerequisite(TimeStampedModel):
"""
Prerequisite model.
"""
course = models.ManyToManyField(Course)
name = models.CharField(max_length=255)
name = models.CharField(max_length=255)


class ExpectedLearningItem(TimeStampedModel):
"""
ExpectedLearningItem model.
"""
value = models.CharField(max_length=255)
value = models.CharField(max_length=255)
course = models.ForeignKey(Course)
index = models.IntegerField()
index = models.IntegerField()


class SyllabusItem(TimeStampedModel):
"""
SyllabusItem model.
"""
parent = models.ForeignKey('self', blank=True, null=True, related_name='children')
parent = models.ForeignKey('self', blank=True, null=True, related_name='children')
course_run = models.ForeignKey(CourseRun)
index = models.IntegerField()
value = models.CharField(max_length=255)
index = models.IntegerField()
value = models.CharField(max_length=255)


class TranscriptLocale(TimeStampedModel):
"""
TranscriptLocale model.
"""
locale = models.ForeignKey(Locale)
locale = models.ForeignKey(Locale)
course_run = models.ForeignKey(CourseRun)


class CourseOrganization(TimeStampedModel):
"""
CourseOrganization model.
"""
course = models.ForeignKey(Course, related_name='relationship')
course = models.ForeignKey(Course, related_name='relationship')
organization = models.ForeignKey(Organization, related_name='relationship')
type = models.CharField(max_length=100)
type = models.CharField(max_length=100)


class CourseRunPerson(TimeStampedModel):
"""
CourseRunPerson model.
"""
course_run = models.ForeignKey(CourseRun, related_name='relationship')
person = models.ForeignKey(Person, related_name='relationship')
type = models.CharField(max_length=100)
index = models.IntegerField()


person = models.ForeignKey(Person, related_name='relationship')
type = models.CharField(max_length=100)
index = models.IntegerField()
7 changes: 4 additions & 3 deletions course_discovery/apps/course_metadata/tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
ECOMMERCE_API_URL = 'https://ecommerce.example.com/api/v2'
JSON = 'application/json'


@skip('Skip until search has been resolved')
@override_settings(ECOMMERCE_API_URL=ECOMMERCE_API_URL, COURSES_API_URL=COURSES_API_URL)
class CourseTests(ElasticsearchTestMixin, TestCase):
Expand Down Expand Up @@ -142,12 +143,12 @@ def test_eq(self):
self.assertEqual(course, course)

# Two Courses are equal if their id attributes match
self.assertEqual(course, Course(id=course.id, body=course.body))
self.assertEqual(course, Course(id=course.id, body=course.body)) # pylint: disable=no-member

def test_str(self):
""" Verify the __str__ method returns a string representation of the Course. """
course = CourseFactory()
expected = 'Course {id}: {name}'.format(id=course.id, name=course.name)
expected = 'Course {id}: {name}'.format(id=course.id, name=course.name) # pylint: disable=no-member
self.assertEqual(str(course), expected)

def test_all(self):
Expand Down Expand Up @@ -185,7 +186,7 @@ def test_all_with_limit_and_offset(self):
def test_get(self):
""" Verify the method returns a single course. """
course = CourseFactory()
retrieved = Course.get(course.id)
retrieved = Course.get(course.id) # pylint: disable=no-member
self.assertEqual(course, retrieved)

def test_get_with_missing_course(self):
Expand Down
1 change: 1 addition & 0 deletions course_discovery/apps/course_metadata/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from edx_rest_api_client.client import EdxRestApiClient

from course_discovery.apps.course_metadata.config import COURSES_INDEX_CONFIG
from course_discovery.apps.course_metadata.models import Course, CourseRun

logger = logging.getLogger(__name__)

Expand Down

0 comments on commit 7ed5e4a

Please sign in to comment.