From 940113efeeedf410c23481545c6c0fc1bb1be7ef Mon Sep 17 00:00:00 2001
From: JonahStanley <Jonah_Stanley@brown.edu>
Date: Fri, 28 Jun 2013 08:57:25 -0400
Subject: [PATCH] Fixed long lines

---
 cms/djangoapps/contentstore/features/common.py  | 5 +++--
 cms/djangoapps/contentstore/features/grading.py | 4 +++-
 common/djangoapps/terrain/browser.py            | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py
index 438059cba3..cb24af47e0 100644
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -156,8 +156,9 @@ def create_a_course():
     # Add the user to the instructor group of the course
     # so they will have the permissions to see it in studio
 
-    course = world.GroupFactory.create(name='instructor_MITx/{course_num}/{course_name}'.format(course_num=world.scenario_dict['COURSE'].number, course_name=world.scenario_dict['COURSE'].display_name.replace(" ", "_")))
-    if world.scenario_dict['USER']:
+    course = world.GroupFactory.create(name='instructor_MITx/{}/{}'.format(world.scenario_dict['COURSE'].number,
+                                                                    world.scenario_dict['COURSE'].display_name.replace(" ", "_")))
+    if world.scenario_dict.get('USER') is None:
         user = world.scenario_dict['USER']
     else:
         user = get_user_by_email('robot+studio@edx.org')
diff --git a/cms/djangoapps/contentstore/features/grading.py b/cms/djangoapps/contentstore/features/grading.py
index fdd89564eb..0b60510bf5 100644
--- a/cms/djangoapps/contentstore/features/grading.py
+++ b/cms/djangoapps/contentstore/features/grading.py
@@ -64,7 +64,9 @@ def change_assignment_name(step, old_name, new_name):
 
 @step(u'I go back to the main course page')
 def main_course_page(step):
-    main_page_link_css = 'a[href="/%s/%s/course/%s"]' % (world.scenario_dict['COURSE'].org, world.scenario_dict['COURSE'].number, world.scenario_dict['COURSE'].display_name.replace(' ', '_'),)
+    main_page_link_css = 'a[href="/%s/%s/course/%s"]' % (world.scenario_dict['COURSE'].org,
+                                                        world.scenario_dict['COURSE'].number,
+                                                        world.scenario_dict['COURSE'].display_name.replace(' ', '_'),)
     world.css_click(main_page_link_css)
 
 
diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py
index c338d403d6..ec361a9aff 100644
--- a/common/djangoapps/terrain/browser.py
+++ b/common/djangoapps/terrain/browser.py
@@ -79,7 +79,6 @@ def initial_setup(server):
 
     # Set the browser size to 1280x1024
     world.browser.driver.set_window_size(1280, 1024)
-    #world.absorb({}, 'scenario_dict')
 
 
 @before.each_scenario