Changeset 1324

Show
Ignore:
Timestamp:
05/02/08 15:32:54 (7 months ago)
Author:
nick
Message:

Merged source:pyamf/branches/win32-nan-275

Author: nick
Reviewer: thijs
Fixes #275

Location:
pyamf/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • pyamf/trunk/pyamf/tests/util.py

    r1299 r1324  
    9999 
    100100def isNaN(val): 
    101     if sys.version_info < (2, 5): 
     101    if sys.version_info < (2, 5) or sys.platform.startswith('win'): 
    102102        import fpconst 
    103103 
     
    107107 
    108108def isPosInf(val): 
    109     if sys.version_info < (2, 5): 
     109    if sys.version_info < (2, 5) or sys.platform.startswith('win'): 
    110110        import fpconst 
    111111 
     
    115115 
    116116def isNegInf(val): 
    117     if sys.version_info < (2, 5): 
     117    if sys.version_info < (2, 5) or sys.platform.startswith('win'): 
    118118        import fpconst 
    119119 
  • pyamf/trunk/pyamf/util/__init__.py

    r1299 r1324  
    528528    return merge([[C]] + map(get_mro, C.__bases__) + [list(C.__bases__)]) 
    529529 
    530 if sys.version_info < (2, 5): 
     530if sys.version_info < (2, 5) or sys.platform.startswith('win'): 
    531531    # workaround for python2.4's shortcomings with exceptional floats 
    532532    # see: http://blog.pyamf.org/archives/when-is-nan-not-a-number-with-python-24 
  • pyamf/trunk/setup.py

    r1299 r1324  
    3333    install_requires.extend( 
    3434        ["elementtree >= 1.2.6", "uuid>=1.30", "fpconst>=0.7.2"]) 
     35elif sys.platform.startswith('win'): 
     36    install_requires.append("fpconst>=0.7.2") 
    3537 
    3638keyw = """\