Merge remote-tracking branch 'origin/4.2.x' into 4.3.x

conda · Jan 12, 2017 · 648d7fc · 648d7fc
2 parents 101f3cc + 83ae90f
commit 648d7fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -206,6 +206,12 @@
 * context-dependent setup.py files (#4057)
 
 
+## 4.2.16 (unreleased)
+
+### Bug Fixes
+* do not replace \ with / in file:// URLs on Windows (#4269)
+
+
 ## 4.2.15 (2017-01-10)
 
 ### Improvements

diff --git a/conda/common/url.py b/conda/common/url.py
@@ -51,8 +51,6 @@ def path_to_url(path):
 
 @memoize
 def urlparse(url):
-    if on_win and url.startswith('file:'):
-        url.replace('\\', '/')
     return parse_url(url)
 
 

diff --git a/conda/models/channel.py b/conda/models/channel.py
@@ -212,8 +212,6 @@ def from_value(value):
             return Channel(name=UNKNOWN_CHANNEL)
         value = ensure_text_type(value)
         if has_scheme(value):
-            if value.startswith('file:'):
-                value = win_path_backout(value)
             return Channel.from_url(value)
         elif is_path(value):
             return Channel.from_url(path_to_url(value))