Permalink
Browse files

gis: Changed the inches attribute name from `in` (a Python reserved k…

…eyword) to `inch`. Thanks, andre_pl.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent b33e709 commit 25cfbd6d665b7ac7504766f0b0900f6affdd4533 @jbronn jbronn committed Jul 26, 2008
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/contrib/gis/measure.py
View
6 django/contrib/gis/measure.py
@@ -30,7 +30,7 @@
Distance and Area objects to allow for sensible and convienient calculation
and conversions.
-Author: Robert Coup, Justin Bronn
+Authors: Robert Coup, Justin Bronn
Inspired by GeoPy (http://exogen.case.edu/projects/geopy/)
and Geoff Biggs' PhD work on dimensioned units for robotics.
@@ -101,7 +101,7 @@ class Distance(MeasureBase):
'german_m' : 1.0000135965,
'gold_coast_ft' : 0.304799710181508,
'indian_yd' : 0.914398530744,
- 'in' : 0.0254,
+ 'inch' : 0.0254,
'km': 1000.0,
'link' : 0.201168,
'link_benoit' : 0.20116782,
@@ -122,7 +122,7 @@ class Distance(MeasureBase):
ALIAS = {
'centimeter' : 'cm',
'foot' : 'ft',
- 'inches' : 'in',
+ 'inches' : 'inch',
'kilometer' : 'km',
'kilometre' : 'km',
'meter' : 'm',

0 comments on commit 25cfbd6

Please sign in to comment.