-

cool-RR · cool-RR · commit cacea4eee639 · 2013-09-06T03:48:44.000+03:00
diff --git a/misc/IDE files/Wing/python_toolbox.wpr b/misc/IDE files/Wing/python_toolbox.wpr
@@ -24,23 +24,8 @@ proj.directory-list = [{'dirloc': loc('../../..'),
                         'watch_for_changes': True}]
 proj.file-type = 'shared'
 proj.home-dir = loc('../../..')
-proj.launch-config = {loc('../../../python_toolbox/__init__.py'): ('project',
-        (u'',
-         'launch-OHU716PSo2P5T54y')),
-                      loc('../../../python_toolbox/binary_search/binary_search_profile.py'): (''\
-        'project',
-        (u'',
-         'launch-OHU716PSo2P5T54y')),
-                      loc('../../../python_toolbox/cute_iter_tools.py'): ('p'\
-        'roject',
-        (u'',
-         'launch-OHU716PSo2P5T54y')),
-                      loc('../../../run_tests.py'): ('custom',
+proj.launch-config = {loc('../../../run_tests.py'): ('custom',
         ('',
-         'launch-OHU716PSo2P5T54y')),
-                      loc('../../../test_python_toolbox/test_binary_search/test.py'): (''\
-        'project',
-        (u'',
          'launch-OHU716PSo2P5T54y'))}
 testing.auto-test-file-specs = [('glob',
                                  'test_python_toolbox/test*.py')]
diff --git a/python_toolbox/pickle_tools.py b/python_toolbox/pickle_tools.py
@@ -187,8 +187,8 @@ def persistent_load(self, id_string):
             raise pickle_module.UnpicklingError('Invalid persistent id')
  
  
-def pickle_and_compress(thing):
+def compickle(thing):
     return zlib.compress(pickle_module.dumps(thing, protocol=2))
 
-def decompress_and_unpickle(thing):
+def decompickle(thing):
     return pickle_module.loads(zlib.decompress(thing))
diff --git a/test_python_toolbox/test_pickle_tools/test_compressing.py b/test_python_toolbox/test_pickle_tools/test_compressing.py
@@ -24,8 +24,6 @@
 )
 
 def test():
-    pickled_and_compressed = pickle_tools.pickle_and_compress(my_messy_object)
-    assert len(pickled_and_compressed) < \
-                                      len(pickle_module.dumps(my_messy_object))
-    assert pickle_tools.decompress_and_unpickle(pickled_and_compressed) == \
-                                                                my_messy_object
+    compickled = pickle_tools.compickle(my_messy_object)
+    assert len(compickled) < len(pickle_module.dumps(my_messy_object))
+    assert pickle_tools.decompickle(compickled) == my_messy_object
