diff options
| author | Ondřej Nový <novy@ondrej.org> | 2016-02-14 19:26:09 +0100 |
|---|---|---|
| committer | Ondřej Nový <novy@ondrej.org> | 2016-02-14 19:26:09 +0100 |
| commit | a85231280accdfec8ef9cf67213ff706eb242889 (patch) | |
| tree | c84bb817ccf5bae224e473bb15959a4fb97d41ba /factory/compat.py | |
| parent | d92aeedcf27326270cb3dcd8b780566728a489a9 (diff) | |
| parent | 41560aa54e83fe539c0a5a1935bcaaf6363a522c (diff) | |
| download | factory-boy-a85231280accdfec8ef9cf67213ff706eb242889.tar factory-boy-a85231280accdfec8ef9cf67213ff706eb242889.tar.gz | |
Merge tag '2.6.1' into debian/unstable
Release of factory_boy 2.6.1
Diffstat (limited to 'factory/compat.py')
| -rw-r--r-- | factory/compat.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/factory/compat.py b/factory/compat.py index 7747b1a..737d91a 100644 --- a/factory/compat.py +++ b/factory/compat.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (c) 2010 Mark Sandstrom -# Copyright (c) 2011-2013 Raphaël Barrois +# Copyright (c) 2011-2015 Raphaël Barrois # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -42,14 +42,6 @@ else: # pragma: no cover from io import BytesIO -if sys.version_info[:2] == (2, 6): # pragma: no cover - def float_to_decimal(fl): - return decimal.Decimal(str(fl)) -else: # pragma: no cover - def float_to_decimal(fl): - return decimal.Decimal(fl) - - try: # pragma: no cover # Python >= 3.2 UTC = datetime.timezone.utc |