# HG changeset patch
# User Ed Morley <emorley@mozilla.com>
# Date 2014-03-05 09:31:05
# Node ID 7d83c3b6e8d960e02c59bb6140b0ef60f4794fdc
# Parent  779ceb84f4f782d32dfe47f6684107c08d2f6142

extensions: use normpath to allow trailing '\' on Windows (issue4187)

Fixes same issue as 5c794e7331e7 but now works on Windows too.

With this patch a trailing backward slash won't prevent the extension from
being found on Windows, and we continue to support any combination of forward
and back slashes within the path.

diff --git a/mercurial/extensions.py b/mercurial/extensions.py
--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -43,10 +43,10 @@ def find(name):
 
 def loadpath(path, module_name):
     module_name = module_name.replace('.', '_')
-    path = util.expandpath(path)
+    path = util.normpath(util.expandpath(path))
     if os.path.isdir(path):
         # module/__init__.py style
-        d, f = os.path.split(path.rstrip('/'))
+        d, f = os.path.split(path)
         fd, fpath, desc = imp.find_module(f, [d])
         return imp.load_module(module_name, fd, fpath, desc)
     else: