mypy 0.4 is out (#25)

Author: mr-c

Makefile

@@ -155,7 +155,7 @@ diff-cover.html: coverage.xml
 
 ## test        : run the ${MODULE} test suite
 test: FORCE
-	python tests/test_examples.py 
+	python setup.py test
 
 sloccount.sc: ${PYSOURCES} Makefile
 	sloccount --duplicates --wide --details $^ > $@
@@ -169,8 +169,7 @@ list-author-emails:
 	@git log --format='%aN,%aE' | sort -u | grep -v 'root'
 
 mypy: ${PYSOURCES}
-	MYPYPATH=typeshed/2.7 mypy --py2 schema_salad
-	#MYPYPATH=typeshed/2.7 mypy --py2  --disallow-untyped-calls schema_salad
+	MYPYPATH=typeshed/2.7 mypy --py2 --disallow-untyped-calls schema_salad
 
 jenkins:
 	if ! test -d env ; then virtualenv env ; fi

schema_salad/ref_resolver.py

@@ -268,9 +268,7 @@ def resolve_ref(self, ref, base_url=None):
         if not isinstance(ref, (str, unicode)):
             raise ValueError("Must be string: `%s`" % str(ref))
 
-        url = self.expand_url(cast(  # bug in mypy 0.3.1, fixed in 0.4-dev
-            Union[str, unicode], ref), base_url,
-            scoped=(obj is not None))
+        url = self.expand_url(ref, base_url, scoped=(obj is not None))
 
         # Has this reference been loaded already?
         if url in self.idx:
@@ -316,7 +314,7 @@ def resolve_ref(self, ref, base_url=None):
             return obj, metadata
 
     def resolve_all(self, document, base_url, file_base=None):
-        # type: (Any, Union[str, unicode], Union[str, unicode]) -> Tuple[Any, Dict[str, str]]
+        # type: (Any, Union[str, unicode], Union[str, unicode]) -> Tuple[Any, Dict[str, Any]]
         loader = self
         metadata = {}  # type: Dict[str, Any]
         if file_base is None:
@@ -524,13 +522,11 @@ def validate_link(self, field, link):
         if isinstance(link, (str, unicode)):
             if field in self.vocab_fields:
                 if link not in self.vocab and link not in self.idx and link not in self.rvocab:
-                    if not self.check_file(cast(  # bug in mypy 0.3.1
-                            Union[str, unicode], link)):  # fixed in mypy 0.4-dev
+                    if not self.check_file(link):
                         raise validate.ValidationException(
                             "Field `%s` contains undefined reference to `%s`" % (field, link))
             elif link not in self.idx and link not in self.rvocab:
-                if not self.check_file(cast(  # bug in mypy 0.3.1
-                        Union[str, unicode], link)):  # fixed in mypy 0.4-dev
+                if not self.check_file(link):
                     raise validate.ValidationException(
                         "Field `%s` contains undefined reference to `%s`" % (field, link))
         elif isinstance(link, list):

schema_salad/schema.py

@@ -159,7 +159,7 @@ def get_metaschema():
 
 
 def load_schema(schema_ref, cache=None):
-    # type: (Union[unicode, Dict[str, Any]], Dict) -> Tuple[ref_resolver.Loader, Union[avro.schema.Names, avro.schema.SchemaParseException], Dict[unicode, Any]]
+    # type: (Union[unicode, Dict[str, Any]], Dict) -> Tuple[ref_resolver.Loader, Union[avro.schema.Names, avro.schema.SchemaParseException], Dict[unicode, Any], ref_resolver.Loader]
     metaschema_names, metaschema_doc, metaschema_loader = get_metaschema()
     if cache is not None:
         metaschema_loader.cache = cache
@@ -330,12 +330,8 @@ def make_valid_avro(items, alltypes, found, union=False):
             ret.append(make_valid_avro(i, alltypes, found, union=union))
         return ret
     if union and isinstance(items, (str, unicode)):
-        if items in alltypes and avro_name(cast(  # bug in mypy 0.3.1, fixed in
-                Union[str, unicode], items)) not in found:  # 0.4-dev
-            return cast(Dict,
-                    make_valid_avro(alltypes[cast(  # bug in mypy 0.3.1, fixed
-                        # fixed in 0.4-dev
-                        Union[str, unicode], items)], alltypes, found,
+        if items in alltypes and avro_name(items) not in found:
+            return cast(Dict, make_valid_avro(alltypes[items], alltypes, found,
                         union=union))
         items = avro_name(items)  # type: ignore
         # bug in mypy 0.3.1, fixed in 0.4-dev

tox.ini

@@ -9,7 +9,7 @@ deps = -rrequirements.txt
 [testenv:py34-mypy]
 commands = make mypy
 whitelist_externals = make
-deps = mypy-lang
+deps = mypy-lang>=0.4
 
 [testenv:py35-lint]
 commands = flake8 schema_salad setup.py

typeshed/2.7/rdflib/graph.pyi

@@ -70,7 +70,10 @@ class Graph(Node):
     def namespaces(self): ...
     def absolutize(self, uri, defrag=1): ...
     def serialize(self, destination: Union[str, IO[Any]]=None, format: str='', base: str=None, encoding: str=None, **args) -> Union[bytes, None]: ...
-    def parse(self, source: str=None, publicID: str=None, format: str=None, location: str=None, file: IO[Any]=None, data: str=None, **args): ...
+    def parse(self, source: str = None, publicID: str = None,
+              format: Union[str, unicode] = None,
+              location: Union[str, unicode] = None, file: IO[Any] = None,
+              data: str = None, **args): ...
     def load(self, source, publicID=None, format=''): ...
     def query(self, query_object, processor: str = '', result: str = '', initNs: Dict = None, initBindings: Dict = None, use_store_provided: bool = True, **kwargs) -> Result: ...
     def update(self, update_object, processor='', initNs=..., initBindings=..., use_store_provided=True, **kwargs): ...