2 files changed, 15 insertions, 3 deletions
diff --git a/src/virtualenv/activation/python/__init__.py b/src/virtualenv/activation/python/__init__.py
index 1d73e99..36b2b2c 100644
--- a/src/virtualenv/activation/python/__init__.py
+++ b/src/virtualenv/activation/python/__init__.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
 import json
 import os
 
-from pathlib2 import Path
+from virtualenv.util import Path
 
 from ..via_template import ViaTemplateActivator
 
diff --git a/src/virtualenv/activation/python/activate_this.py b/src/virtualenv/activation/python/activate_this.py
index fc8d449..3311fe8 100644
--- a/src/virtualenv/activation/python/activate_this.py
+++ b/src/virtualenv/activation/python/activate_this.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Activate virtualenv for current interpreter:
 
 Use exec(open(this_file).read(), {'__file__': this_file}).
@@ -14,14 +15,21 @@ try:
 except NameError:
     raise AssertionError("You must use exec(open(this_file).read(), {'__file__': this_file}))")
 
+
+def set_env(key, value, encoding):
+    if sys.version_info[0] == 2:
+        value = value.encode(encoding)
+    os.environ[key] = value
+
+
 # prepend bin to PATH (this file is inside the bin directory)
 bin_dir = os.path.dirname(os.path.abspath(__file__))
-os.environ["PATH"] = os.pathsep.join([bin_dir] + os.environ.get("PATH", "").split(os.pathsep))
+set_env("PATH", os.pathsep.join([bin_dir] + os.environ.get("PATH", "").split(os.pathsep)), sys.getfilesystemencoding())
 
 base = os.path.dirname(bin_dir)
 
 # virtual env is right above bin directory
-os.environ["VIRTUAL_ENV"] = base
+set_env("VIRTUAL_ENV", base, sys.getfilesystemencoding())
 
 # add the virtual environments site-packages to the host python import mechanism
 prev = set(sys.path)
@@ -33,7 +41,11 @@ __SITE_PACKAGES__
 '''
 
 for site_package in json.loads(site_packages):
+    if sys.version_info[0] == 2:
+        site_package = site_package.encode('utf-8').decode(sys.getfilesystemencoding())
     path = os.path.realpath(os.path.join(os.path.dirname(__file__), site_package))
+    if sys.version_info[0] == 2:
+        path = path.encode(sys.getfilesystemencoding())
     site.addsitedir(path)
 # fmt: on