Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into pr/628

Browse Source
This commit is contained in:
Paul Tagliamonte 2014-08-18 11:29:19 -04:00
commit 911424b359
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.mailmap Normal file
View File

@ -0,0 +1,12 @@
Paul R. Tagliamonte <paultag@debian.org> Paul Tagliamonte <paultag@debian.org>
Paul R. Tagliamonte <paultag@debian.org> Paul Tagliamonte <tag@pault.ag>
Paul R. Tagliamonte <paultag@debian.org> Paul Tagliamonte <paultag@sunlightfoundation.com>
Paul R. Tagliamonte <paultag@debian.org> Paul Tagliamonte <paultag@ubuntu.com>
Morten Linderud <mcfoxax@gmail.com> Foxboron <mcfoxax@gmail.com>
Morten Linderud <mcfoxax@gmail.com> <fox@velox.pw>
James King <james@agentultra.com> agentultra <james@agentultra.com>
James King <james@agentultra.com> J Kenneth King <james@agentultra.com>
Abhishek L <abhishek.lekshmanan@gmail.com> <abhishekl.2006@gmail.com>
Bob Tolbert <bob@tolbert.org> Bob Tolbert <bob@eyesopen.com>
Guillermo Vaya <guivaya@gmail.com> Guillermo Vaya <guillermo.vaya@gigas.com>
Gergely Nagy <algernon@balabit.hu> Gergely Nagy <algernon@madhouse-project.org>

2
hy/models/complex.py
View File

@ -23,7 +23,7 @@ from hy.models import HyObject
class HyComplex(HyObject, complex):
"""
Internal represntation of a Hy Complex. May raise a ValueError as if
Internal representation of a Hy Complex. May raise a ValueError as if
complex(foo) was called, given HyComplex(foo).
"""

2
hy/models/float.py
View File

@ -23,7 +23,7 @@ from hy.models import HyObject
class HyFloat(HyObject, float):
"""
Internal represntation of a Hy Float. May raise a ValueError as if
Internal representation of a Hy Float. May raise a ValueError as if
float(foo) was called, given HyFloat(foo).
"""

2
hy/models/integer.py
View File

@ -24,7 +24,7 @@ from hy._compat import long_type
class HyInteger(HyObject, long_type):
"""
Internal represntation of a Hy Integer. May raise a ValueError as if
Internal representation of a Hy Integer. May raise a ValueError as if
int(foo) was called, given HyInteger(foo). On python 2.x long will
be used instead
"""