Commit 29c9a7d2 authored by Andrew Artajos's avatar Andrew Artajos Committed by Claude Paroz
Browse files

[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 d2ef521a from master.
parent a9b62189

docs/ref/contrib/gis/tutorial.txt

+2 −2
Original line number Diff line number Diff line
@@ -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,