Added two tests, in build the extension is not a parameter anymore, checkout travis.sh

rockneurotiko · rockneurotiko · commit 8cddea647a75 · 2014-12-03T09:14:43.000+01:00
diff --git a/mypy/build.py b/mypy/build.py
@@ -228,7 +228,7 @@ def default_lib_path(data_dir: str, target: int, pyversion: int,
 
 def lookup_program(module: str, lib_path: List[str]) -> str:
     # Modules are .py and not .pyi
-    path = find_module(module, lib_path, ['.py'])
+    path = find_module(module, lib_path)
     if path:
         return path
     else:
@@ -470,7 +470,7 @@ def all_imported_modules_in_file(self,
 
     def is_module(self, id: str) -> bool:
         """Is there a file in the file system corresponding to module id?"""
-        return find_module(id, self.lib_path, ['.pyi', '.py']) is not None
+        return find_module(id, self.lib_path) is not None
 
     def final_passes(self, files: List[MypyFile],
                      types: Dict[Node, Type]) -> None:
@@ -838,7 +838,7 @@ def read_module_source_from_file(id: str,
       id:       module name, a string of form 'foo' or 'foo.bar'
       lib_path: library search path
     """
-    path = find_module(id, lib_path, ['.pyi', '.py'])
+    path = find_module(id, lib_path)
     if path is not None:
         text = ''
         try:
@@ -854,8 +854,9 @@ def read_module_source_from_file(id: str,
         return None, None
 
 
-def find_module(id: str, lib_path: List[str], extensions: List[str]) -> str:
+def find_module(id: str, lib_path: List[str]) -> str:
     """Return the path of the module source file, or None if not found."""
+    extensions = ['.pyi', '.py']
     for pathitem in lib_path:
         for extension in extensions:
             comp = id.split('.')
diff --git a/mypy/test/data/check-modules.test b/mypy/test/data/check-modules.test
@@ -1,3 +1,4 @@
+
 -- Test cases for the type checker.
 
 [case testAccessImportedDefinitions]
@@ -137,6 +138,24 @@ def f() -> None: pass
 [out]
 main: In class "C":
 
+[case testImportWithStub]
+import _m
+_m.f("hola")
+[file _m.pyi]
+def f(c:str) -> None: pass
+[out]
+
+
+[case testImportWithStubIncompatibleType]
+import _m
+_m.f("hola")
+_m.f(12)  # E: Argument 1 to "f" has incompatible type "int"; expected "str"
+[file _m.py]
+def f(c):
+  print(c)
+[file _m.pyi]
+def f(c:str) -> None: pass
+
 [case testInvalidOperationsOnModules]
 import m
 import typing
diff --git a/travis.sh b/travis.sh
@@ -32,7 +32,7 @@ done
 STUBTEST=_test_stubs.py
 echo "import typing" > $STUBTEST
 cd stubs/3.2
-ls *.pyi | sed s/\\.pyi//g | sed "s/^/import /g" >> ../../$STUBTEST
+ls *.py | sed s/\\.py//g | sed "s/^/import /g" >> ../../$STUBTEST
 for m in os os.path; do
     echo "import $m" >> ../../$STUBTEST
 done
