-

cool-RR · cool-RR · commit fa70a014a5ca · 2013-08-26T02:36:08.000+03:00
diff --git a/python_toolbox/monkeypatch_envelopes.py b/python_toolbox/monkeypatch_envelopes.py
@@ -9,7 +9,7 @@
 
 
 @monkeypatching_tools.monkeypatch_method(envelopes.Envelope)
-def add_attachment_from_string(self, file_data,
+def add_attachment_from_string(self, file_data, file_name, 
                                mimetype='application/octet-stream'):
     from python_toolbox.third_party.envelopes.envelope import \
                                                    MIMEBase, email_encoders, os
@@ -19,9 +19,8 @@ def add_attachment_from_string(self, file_data,
     part.set_payload(file_data)
     email_encoders.encode_base64(part)
 
-    part_filename = os.path.basename(self._encoded(file_path))
     part.add_header('Content-Disposition', 'attachment; filename="%s"'
-                    % part_filename)
+                    % file_name)
 
     self._parts.append((mimetype, part))
 
diff --git a/test_python_toolbox/test_cute_profile/test_cute_profile.py b/test_python_toolbox/test_cute_profile/test_cute_profile.py
@@ -254,30 +254,3 @@ def test_folder_handler():
             assert len(os.listdir(temp_folder)) == 2
             
 
-def test_email_handler():
-    with temp_value_setting.TempValueSetter((cute_profile.profile_handling,
-                                             'threading'), dummy_threading):
-        f = cute_profile.profile_ready(profile_handler=temp_folder)(func)
-
-        f(1, 2)
-        assert len(os.listdir(temp_folder)) == 0
-
-        f(1, 2)
-        assert len(os.listdir(temp_folder)) == 0
-
-        f.profiling_on = True
-        
-        f(1, 2)
-        assert len(os.listdir(temp_folder)) == 1
-
-        f(1, 2)
-        assert len(os.listdir(temp_folder)) == 1
-        
-        f.profiling_on = True
-        
-        f(1, 2)
-        assert len(os.listdir(temp_folder)) == 2
-
-        f(1, 2)
-        assert len(os.listdir(temp_folder)) == 2
-        
