using posixpath for URL creation

kbrose · kbrose · commit 8ff4493802d0 · 2017-04-11T18:54:31.000-05:00
diff --git a/wfdb/downloads.py b/wfdb/downloads.py
@@ -1,6 +1,7 @@
 import numpy as np
 import re
 import os
+import posixpath
 import sys
 import requests
 from IPython.display import display
@@ -9,7 +10,7 @@
 def streamheader(recordname, pbdir):
 
     # Full url of header location
-    url = os.path.join(dbindexurl, pbdir, recordname+'.hea')
+    url = posixpath.join(dbindexurl, pbdir, recordname+'.hea')
     r = requests.get(url)
 
     # Raise HTTPError if invalid url
@@ -44,7 +45,7 @@ def streamheader(recordname, pbdir):
 def streamdat(filename, pbdir, fmt, bytecount, startbyte, datatypes):
 
     # Full url of dat file
-    url = os.path.join(dbindexurl, pbdir, filename)
+    url = posixpath.join(dbindexurl, pbdir, filename)
 
     # Specify the byte range
     endbyte = startbyte + bytecount-1
@@ -72,7 +73,7 @@ def streamdat(filename, pbdir, fmt, bytecount, startbyte, datatypes):
 def streamannotation(filename, pbdir):
 
     # Full url of annotation file
-    url = os.path.join(dbindexurl, pbdir, filename)
+    url = posixpath.join(dbindexurl, pbdir, filename)
 
     # Get the content
     r = requests.get(url)
@@ -94,7 +95,7 @@ def getdblist():
     Usage:
     dblist = getdblist()
     """
-    url = os.path.join(dbindexurl, 'DBS')
+    url = posixpath.join(dbindexurl, 'DBS')
     r = requests.get(url)
 
     dblist = r.content.decode('ascii').splitlines()
@@ -109,7 +110,7 @@ def getdblist():
 def getrecordlist(dburl, records):
     # Check for a RECORDS file
     if records == 'all':
-        r = requests.get(os.path.join(dburl, 'RECORDS'))
+        r = requests.get(posixpath.join(dburl, 'RECORDS'))
         if r.status_code == 404:
             sys.exit('The database '+dburl+' has no WFDB files to download')
 
@@ -125,7 +126,7 @@ def getannotators(dburl, annotators):
 
     if annotators is not None:
         # Check for an ANNOTATORS file
-        r = requests.get(os.path.join(dburl, 'ANNOTATORS'))
+        r = requests.get(posixpath.join(dburl, 'ANNOTATORS'))
         if r.status_code == 404:
             if annotators == 'all':
                 return
@@ -175,7 +176,7 @@ def dlpbfile(inputs):
     basefile, subdir, pbdb, dlbasedir, keepsubdirs, overwrite = inputs
 
     # Full url of file
-    url = os.path.join(dbindexurl, pbdb, subdir, basefile)
+    url = posixpath.join(dbindexurl, pbdb, subdir, basefile)
 
     # Get the request header
     rh = requests.head(url, headers={'Accept-Encoding': 'identity'})
diff --git a/wfdb/records.py b/wfdb/records.py
@@ -8,6 +8,7 @@
 import numpy as np
 import re
 import os
+import posixpath
 import sys
 from collections import OrderedDict
 from calendar import monthrange
@@ -1185,7 +1186,7 @@ def dldatabase(pbdb, dlbasedir, records = 'all', annotators = 'all' , keepsubdir
     """
 
     # Full url physiobank database
-    dburl = os.path.join(downloads.dbindexurl, pbdb)
+    dburl = posixpath.join(downloads.dbindexurl, pbdb)
     # Check if the database is valid
     r = requests.get(dburl)
     r.raise_for_status()
@@ -1208,13 +1209,13 @@ def dldatabase(pbdb, dlbasedir, records = 'all', annotators = 'all' , keepsubdir
             # If MIT format, have to figure out all associated files
             allfiles.append(rec+'.hea')
             dirname, baserecname = os.path.split(rec)
-            record = rdheader(baserecname, pbdir = os.path.join(pbdb, dirname))
+            record = rdheader(baserecname, pbdir = posixpath.join(pbdb, dirname))
 
             # Single segment record
             if type(record) == Record:
                 # Add all dat files of the segment
                 for file in record.filename:
-                    allfiles.append(os.path.join(dirname, file))
+                    allfiles.append(posixpath.join(dirname, file))
 
             # Multi segment record
             else:
@@ -1223,19 +1224,19 @@ def dldatabase(pbdb, dlbasedir, records = 'all', annotators = 'all' , keepsubdir
                     if seg == '~':
                         continue
                     # Add the header
-                    allfiles.append(os.path.join(dirname, seg+'.hea'))
+                    allfiles.append(posixpath.join(dirname, seg+'.hea'))
                     # Layout specifier has no dat files
                     if seg.endswith('_layout'):
                         continue
                     # Add all dat files of the segment
-                    recseg = rdheader(seg, pbdir = os.path.join(pbdb, dirname))
+                    recseg = rdheader(seg, pbdir = posixpath.join(pbdb, dirname))
                     for file in recseg.filename:
-                        allfiles.append(os.path.join(dirname, file))
+                        allfiles.append(posixpath.join(dirname, file))
         # check whether the record has any requested annotation files
         if annotators is not None:
             for a in annotators:
                 annfile = rec+'.'+a
-                url = os.path.join(downloads.dbindexurl, pbdb, annfile)
+                url = posixpath.join(downloads.dbindexurl, pbdb, annfile)
                 rh = requests.head(url)
 
                 if rh.status_code != 404:
@@ -1282,7 +1283,7 @@ def dldatabasefiles(pbdb, dlbasedir, files, keepsubdirs = True, overwrite = Fals
     """
 
     # Full url physiobank database
-    dburl = os.path.join(downloads.dbindexurl, pbdb)
+    dburl = posixpath.join(downloads.dbindexurl, pbdb)
     # Check if the database is valid
     r = requests.get(dburl)
     r.raise_for_status()
