* merge 2 and 3 stubs for fileinput Plus some minor fixes. * pytype doesn't like generic type aliases