--- a/devtools/qunit.py	Mon Oct 18 11:05:45 2010 +0200
+++ b/devtools/qunit.py	Mon Oct 18 11:47:06 2010 +0200
@@ -9,9 +9,8 @@
 
 # imported by default to simplify further import statements
 from logilab.common.testlib import unittest_main, with_tempdir, InnerTest
+from logilab.common.shellutils import getlogin
 
-import os
-from os.path import expanduser
 import cubicweb
 from cubicweb.view import StartupView
 from cubicweb.web.controller import Controller
@@ -54,8 +53,8 @@
         stdout = TemporaryFile()
         stderr = TemporaryFile()
         try:
-            home = expanduser('~')
-            user = os.getlogin()
+            home = osp.expanduser('~')
+            user = getlogin()
             assert os.access(home, os.W_OK), \
                    'No write access to your home directory, Firefox will crash.'\
                    ' Are you sure "%s" is a valid home  for user "%s"' % (home, user)

--- a/setup.py	Mon Oct 18 11:05:45 2010 +0200
+++ b/setup.py	Mon Oct 18 11:47:06 2010 +0200
@@ -222,6 +222,7 @@
         packages = [modname] + get_packages(os.getcwd(), modname)
     if USE_SETUPTOOLS:
         kwargs['install_requires'] = install_requires
+        kwargs['zip_safe'] = False
     kwargs['packages'] = packages
     kwargs['package_data'] = package_data
     return setup(name=distname, version=version, license=license, url=web,