-

Ram Rachum · Ram Rachum · commit 4d7a45c90aef · 2011-02-06T14:04:57.000-05:00
diff --git a/garlicsim/garlicsim/general_misc/cute_inspect/__init__.py b/garlicsim/garlicsim/general_misc/cute_inspect/__init__.py
@@ -6,4 +6,5 @@
 from . import forked_inspect
 
 getargspec = forked_inspect.getargspec
-getcallargs = forked_inspect.getcallargs
+getcallargs = forked_inspect.getcallargs
+getsource = forked_inspect.getsource
diff --git a/garlicsim/garlicsim/scripts/start_simpack.py b/garlicsim/garlicsim/scripts/start_simpack.py
@@ -108,7 +108,7 @@ def start_simpack(containing_folder, name):
         source_file_name = pkg_resources.resource_filename(
             simpack_template_package_name, file
         )
-        with open(source_file_name, 'Ur') as source:
+        with open(source_file_name, 'rU') as source:
             
             with open(dest_file, 'w') as destination:
                 
diff --git a/garlicsim/test_garlicsim/test_doc/test_tutorial_2/test.py b/garlicsim/test_garlicsim/test_doc/test_tutorial_2/test.py
@@ -10,13 +10,16 @@
 import shutil
 import tempfile
 import re
+import types
 import glob
 
 from garlicsim.general_misc.temp_value_setters import \
     TempWorkingDirectorySetter
 from garlicsim.general_misc import sys_tools
 from garlicsim.general_misc import import_tools
+from garlicsim.general_misc import cute_inspect
 
+import garlicsim.scripts.simpack_template.simpack_name.state
 import garlicsim.scripts.start_simpack
 start_simpack_file = garlicsim.scripts.start_simpack.__file__
 
@@ -94,7 +97,14 @@ def test():
                  "your new simpack.\n")
             simpack_path = os.path.join(temp_dir, '_coin_flip')
             assert os.path.isdir(simpack_path)
+                                                                      
             state_module_path = os.path.join(simpack_path, 'state.py')
+            
+            check_module_was_copied_with_correct_newlines(
+                state_module_path,
+                garlicsim.scripts.simpack_template.simpack_name.state
+            )
+            
             with open(state_module_path, 'w') as state_file:
                 state_file.write(state_module_contents_for_coinflip)
                 
@@ -149,5 +159,20 @@ def get_end_balance():
             
     finally:
         shutil.rmtree(temp_dir)
-
+    
         
+def check_module_was_copied_with_correct_newlines(destination_path,
+                                                  source_module):
+    
+    assert os.path.isfile(destination_path)
+    assert isinstance(source_module, types.ModuleType)
+    
+    number_of_newlines = cute_inspect.getsource(source_module).count('\n')
+    
+    with file(destination_path, 'rb') as destination_file:
+        destination_string = destination_file.read()
+        
+    assert destination_string.count(os.linesep) == number_of_newlines
+    
+    if os.linesep == '\n':
+        assert '\r\n' not in destination_string

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ def start_simpack(containing_folder, name):`
`108`	`108`	`source_file_name = pkg_resources.resource_filename(`
`109`	`109`	`simpack_template_package_name, file`
`110`	`110`	`)`
`111`		`- with open(source_file_name, 'Ur') as source:`
	`111`	`+ with open(source_file_name, 'rU') as source:`
`112`	`112`
`113`	`113`	`with open(dest_file, 'w') as destination:`
`114`	`114`