merge 3.4

This commit is contained in:
Benjamin Peterson 2015-03-09 10:37:59 -04:00
commit 5d2d63ed7d
1 changed files with 9 additions and 6 deletions

View File

@ -1,13 +1,16 @@
import unittest, struct
import os
import sys
from test import support
import fractions
import math
from math import isinf, isnan, copysign, ldexp
import operator
import os
import random
import sys
import struct
import time
import random, fractions
import unittest
from test import support
from math import isinf, isnan, copysign, ldexp
INF = float("inf")
NAN = float("nan")