clean up typeshed & freshen rdflib hints

Author: mr-c

.gitignore

@@ -6,7 +6,7 @@
 build/
 dist/
 ruamel
-typeshed/2and3/ruamel/yaml
+typeshed/ruamel/yaml
 # virtualenv 
 venv/
 .cache/

Makefile

@@ -168,16 +168,16 @@ mypy3: mypy
 mypy: ${PYSOURCES}
 	if ! test -f $(shell python3 -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))')/py.typed ; \
 	then \
-		rm -Rf typeshed/2and3/ruamel/yaml ; \
+		rm -Rf typeshed/ruamel/yaml ; \
 		ln -s $(shell python3 -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
-			typeshed/2and3/ruamel/ ; \
+			typeshed/ruamel/ ; \
 	fi  # if minimally required ruamel.yaml version is 0.15.99 or greater, than the above can be removed
-	MYPYPATH=$$MYPYPATH:typeshed/3:typeshed/2and3 mypy --disallow-untyped-calls \
+	MYPYPATH=$$MYPYPATH:typeshed mypy --disallow-untyped-calls \
 		 --warn-redundant-casts \
 		 schema_salad
 
 mypyc: ${PYSOURCES}
-	MYPYPATH=typeshed/2and3/:typeshed/3 SCHEMA_SALAD_USE_MYPYC=1 python setup.py test
+	MYPYPATH=typeshed SCHEMA_SALAD_USE_MYPYC=1 python setup.py test
 
 pyupgrade: $(filter-out schema_salad/metaschema.py,${PYSOURCES})
 	pyupgrade --exit-zero-even-if-changed --py36-plus $^

docs/typeshed.rst

@@ -8,9 +8,7 @@ directory.
 
 ::
 
- mkdir out
- stubgen module_name
- mv out/module_name/* typeshed/3/
+ stubgen -o typeshed module_name
  make mypy
 
 Note: the module name is not always the name of the PyPI package

schema_salad/jsonld_context.py

@@ -1,4 +1,5 @@
 import logging
+import unicodedata
 from typing import (
     Any,
     Dict,
@@ -159,10 +160,7 @@ def process_type(
                         raise
                     split_start = rdflib.namespace.SPLIT_START_CATEGORIES
                     for j in range(-1 - colon_index, len(uri)):
-                        if (
-                            rdflib.namespace.category(uri[j]) in split_start
-                            or uri[j] == "_"
-                        ):
+                        if unicodedata.category(uri[j]) in split_start or uri[j] == "_":
                             # _ prevents early split, roundtrip not generate
                             ns = uri[:j]
                             if not ns: