Fix PEP8: E127 continuation line over-indented
for visual indent
This commit is contained in:
@@ -219,9 +219,11 @@ def get_cohort(user, course_key):
|
||||
return None
|
||||
|
||||
try:
|
||||
return CourseUserGroup.objects.get(course_id=course_key,
|
||||
group_type=CourseUserGroup.COHORT,
|
||||
users__id=user.id)
|
||||
return CourseUserGroup.objects.get(
|
||||
course_id=course_key,
|
||||
group_type=CourseUserGroup.COHORT,
|
||||
users__id=user.id,
|
||||
)
|
||||
except CourseUserGroup.DoesNotExist:
|
||||
# Didn't find the group. We'll go on to create one if needed.
|
||||
pass
|
||||
|
||||
@@ -24,8 +24,11 @@ class CourseUserGroup(models.Model):
|
||||
|
||||
# Note: groups associated with particular runs of a course. E.g. Fall 2012 and Spring
|
||||
# 2013 versions of 6.00x will have separate groups.
|
||||
course_id = CourseKeyField(max_length=255, db_index=True,
|
||||
help_text="Which course is this group associated with?")
|
||||
course_id = CourseKeyField(
|
||||
max_length=255,
|
||||
db_index=True,
|
||||
help_text="Which course is this group associated with?",
|
||||
)
|
||||
|
||||
# For now, only have group type 'cohort', but adding a type field to support
|
||||
# things like 'question_discussion', 'friends', 'off-line-class', etc
|
||||
|
||||
@@ -46,8 +46,10 @@ class CountryMiddlewareTests(TestCase):
|
||||
return ip_dict.get(ip_addr, 'US')
|
||||
|
||||
def test_country_code_added(self):
|
||||
request = self.request_factory.get('/somewhere',
|
||||
HTTP_X_FORWARDED_FOR='117.79.83.1')
|
||||
request = self.request_factory.get(
|
||||
'/somewhere',
|
||||
HTTP_X_FORWARDED_FOR='117.79.83.1',
|
||||
)
|
||||
request.user = self.authenticated_user
|
||||
self.session_middleware.process_request(request)
|
||||
# No country code exists before request.
|
||||
@@ -59,8 +61,10 @@ class CountryMiddlewareTests(TestCase):
|
||||
self.assertEqual('117.79.83.1', request.session.get('ip_address'))
|
||||
|
||||
def test_ip_address_changed(self):
|
||||
request = self.request_factory.get('/somewhere',
|
||||
HTTP_X_FORWARDED_FOR='4.0.0.0')
|
||||
request = self.request_factory.get(
|
||||
'/somewhere',
|
||||
HTTP_X_FORWARDED_FOR='4.0.0.0',
|
||||
)
|
||||
request.user = self.anonymous_user
|
||||
self.session_middleware.process_request(request)
|
||||
request.session['country_code'] = 'CN'
|
||||
@@ -71,8 +75,10 @@ class CountryMiddlewareTests(TestCase):
|
||||
self.assertEqual('4.0.0.0', request.session.get('ip_address'))
|
||||
|
||||
def test_ip_address_is_not_changed(self):
|
||||
request = self.request_factory.get('/somewhere',
|
||||
HTTP_X_FORWARDED_FOR='117.79.83.1')
|
||||
request = self.request_factory.get(
|
||||
'/somewhere',
|
||||
HTTP_X_FORWARDED_FOR='117.79.83.1',
|
||||
)
|
||||
request.user = self.anonymous_user
|
||||
self.session_middleware.process_request(request)
|
||||
request.session['country_code'] = 'CN'
|
||||
@@ -83,8 +89,10 @@ class CountryMiddlewareTests(TestCase):
|
||||
self.assertEqual('117.79.83.1', request.session.get('ip_address'))
|
||||
|
||||
def test_same_country_different_ip(self):
|
||||
request = self.request_factory.get('/somewhere',
|
||||
HTTP_X_FORWARDED_FOR='117.79.83.100')
|
||||
request = self.request_factory.get(
|
||||
'/somewhere',
|
||||
HTTP_X_FORWARDED_FOR='117.79.83.100',
|
||||
)
|
||||
request.user = self.anonymous_user
|
||||
self.session_middleware.process_request(request)
|
||||
request.session['country_code'] = 'CN'
|
||||
|
||||
@@ -19,13 +19,15 @@ Pass a single filename."""
|
||||
l = []
|
||||
for user in users:
|
||||
up = UserProfile.objects.get(user=user)
|
||||
d = {'username': user.username,
|
||||
'email': user.email,
|
||||
'is_active': user.is_active,
|
||||
'joined': user.date_joined.isoformat(),
|
||||
'name': up.name,
|
||||
'language': up.language,
|
||||
'location': up.location}
|
||||
d = {
|
||||
'username': user.username,
|
||||
'email': user.email,
|
||||
'is_active': user.is_active,
|
||||
'joined': user.date_joined.isoformat(),
|
||||
'name': up.name,
|
||||
'language': up.language,
|
||||
'location': up.location,
|
||||
}
|
||||
l.append(d)
|
||||
json.dump(l, f)
|
||||
f.close()
|
||||
|
||||
@@ -59,8 +59,10 @@ class TrackMiddleware(object):
|
||||
if string in get_dict:
|
||||
get_dict[string] = '*' * 8
|
||||
|
||||
event = {'GET': dict(get_dict),
|
||||
'POST': dict(post_dict)}
|
||||
event = {
|
||||
'GET': dict(get_dict),
|
||||
'POST': dict(post_dict),
|
||||
}
|
||||
|
||||
# TODO: Confirm no large file uploads
|
||||
event = json.dumps(event)
|
||||
|
||||
@@ -339,8 +339,13 @@ def divide_chemical_expression(s1, s2, ignore_state=False):
|
||||
if treedic['1 phases'] != treedic['2 phases']:
|
||||
return False
|
||||
|
||||
if any(map(lambda x, y: x / y - treedic['1 factors'][0] / treedic['2 factors'][0],
|
||||
treedic['1 factors'], treedic['2 factors'])):
|
||||
if any(
|
||||
map(
|
||||
lambda x, y: x / y - treedic['1 factors'][0] / treedic['2 factors'][0],
|
||||
treedic['1 factors'],
|
||||
treedic['2 factors'],
|
||||
)
|
||||
):
|
||||
# factors are not proportional
|
||||
return False
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user