[Assorted-commits] SF.net SVN: assorted: [567] python-commons/trunk/src/commons

[<yan...@us...>]

Revision: 567
          http://assorted.svn.sourceforge.net/assorted/?rev=567&view=rev
Author:   yangzhang
Date:     2008-03-02 19:24:56 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
small fixes

Modified Paths:
--------------
    python-commons/trunk/src/commons/files.py
    python-commons/trunk/src/commons/setup.py

Modified: python-commons/trunk/src/commons/files.py
===================================================================
--- python-commons/trunk/src/commons/files.py	2008-03-03 03:24:26 UTC (rev 566)
+++ python-commons/trunk/src/commons/files.py	2008-03-03 03:24:56 UTC (rev 567)
@@ -59,7 +59,7 @@
     @rtype: str
     """
     base_dir_name += '-' + os.environ[ 'USER' ]
-    base_dir = paths.path( tempfile.gettempdir() ) / base_dir_name
+    base_dir = path( tempfile.gettempdir() ) / base_dir_name
     soft_makedirs( base_dir )
     if do_create_subdir:
         return tempfile.mkdtemp( dir = base_dir )

Modified: python-commons/trunk/src/commons/setup.py
===================================================================
--- python-commons/trunk/src/commons/setup.py	2008-03-03 03:24:26 UTC (rev 566)
+++ python-commons/trunk/src/commons/setup.py	2008-03-03 03:24:56 UTC (rev 567)
@@ -74,7 +74,7 @@
                 args_translations[ source_name ] = dest_name
             else:
                 args_nontranslations.add( dest_name )
-    
+
     args = {}
     for key, value in pkg_info.iteritems():
         dest_name = None
@@ -89,10 +89,10 @@
 
     # this also allows user to override our args
     args.update( orig_kwargs )
+    args.update( {
+        'package_dir': {'':'src'},
+        'packages': find_packages('src'),
+        'zip_safe': True,
+    } )
 
-    setup( *orig_args,
-           package_dir = {'':'src'},
-           packages = find_packages('src'),
-           zip_safe = True,
-           **args,
-           )
+    setup( *orig_args, **args )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.