From 29c9a7d22096bd9203b956d3ac6a7876009c2090 Mon Sep 17 00:00:00 2001 From: Andrew Artajos Date: Sat, 3 Oct 2015 15:58:29 +1000 Subject: [PATCH] [1.8.x] Fixed #25398 -- Revised instances of os.path.join() Replaced occurrences of os.path.join(BASE_DIR, 'folder/subfolder') to os.path.join(BASE_DIR, 'folder', 'subfolder') Backport of d2ef521a53 from master. --- docs/ref/contrib/gis/tutorial.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt index 6cb700cbc5..f474f8d532 100644 --- a/docs/ref/contrib/gis/tutorial.txt +++ b/docs/ref/contrib/gis/tutorial.txt @@ -362,7 +362,7 @@ tutorial, then you can determine its path using Python's built-in >>> import os >>> import world >>> world_shp = os.path.abspath(os.path.join(os.path.dirname(world.__file__), - ... 'data/TM_WORLD_BORDERS-0.3.shp')) + ... 'data', 'TM_WORLD_BORDERS-0.3.shp')) Now, open the world borders shapefile using GeoDjango's :class:`~django.contrib.gis.gdal.DataSource` interface:: @@ -487,7 +487,7 @@ with the following code:: 'mpoly' : 'MULTIPOLYGON', } - world_shp = os.path.abspath(os.path.join(os.path.dirname(__file__), 'data/TM_WORLD_BORDERS-0.3.shp')) + world_shp = os.path.abspath(os.path.join(os.path.dirname(__file__), 'data', 'TM_WORLD_BORDERS-0.3.shp')) def run(verbose=True): lm = LayerMapping(WorldBorder, world_shp, world_mapping,