Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.8.x] Fixed #25398 -- Revised instances of os.path.join()

Browse Source 
Replaced occurrences of os.path.join(BASE_DIR, 'folder/subfolder')
to os.path.join(BASE_DIR, 'folder', 'subfolder')

Backport of d2ef521a53 from master.
This commit is contained in:
Andrew Artajos 2015-10-03 15:58:29 +10:00 committed by Claude Paroz
parent a9b6218960
commit 29c9a7d220
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/ref/contrib/gis/tutorial.txt
View File

@ -362,7 +362,7 @@ tutorial, then you can determine its path using Python's built-in
>>> import os >>> import os
>>> import world >>> import world
>>> world_shp = os.path.abspath(os.path.join(os.path.dirname(world.__file__), >>> 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 Now, open the world borders shapefile using GeoDjango's
:class:`~django.contrib.gis.gdal.DataSource` interface:: :class:`~django.contrib.gis.gdal.DataSource` interface::
@ -487,7 +487,7 @@ with the following code::
'mpoly' : 'MULTIPOLYGON', '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): def run(verbose=True):
lm = LayerMapping(WorldBorder, world_shp, world_mapping, lm = LayerMapping(WorldBorder, world_shp, world_mapping,