merge 2 and 3 stubs for unicodedata (#1013)

* merge 2 and 3 stubs for unicodedata
* fix a few return types to str in py2

stdlib/2and3/unicodedata.pyi

@@ -0,0 +1,38 @@
+# Stubs for unicodedata (Python 2.7 and 3.4)
+from typing import Any, Text, TypeVar, Union
+
+ucd_3_2_0 = ...  # type: UCD
+ucnhash_CAPI = ...  # type: Any
+unidata_version = ...  # type: str
+
+_default = TypeVar('_default')
+
+def bidirectional(__chr: Text) -> Text: ...
+def category(__chr: Text) -> Text: ...
+def combining(__chr: Text) -> int: ...
+def decimal(__chr: Text, __default: _default=...) -> Union[int, _default]: ...
+def decomposition(__chr: Text) -> Text: ...
+def digit(__chr: Text, __default: _default=...) -> Union[int, _default]: ...
+def east_asian_width(__chr: Text) -> Text: ...
+def lookup(__name: Union[Text, bytes]) -> Text: ...
+def mirrored(__chr: Text) -> int: ...
+def name(__chr: Text, __default: _default=...) -> Union[Text, _default]: ...
+def normalize(__form: Text, __unistr: Text) -> Text: ...
+def numeric(__chr: Text, __default: _default=...) -> Union[float, _default]: ...
+
+class UCD(object):
+    # The methods below are constructed from the same array in C
+    # (unicodedata_functions) and hence identical to the methods above.
+    unidata_version = ...  # type: str
+    def bidirectional(self, __chr: Text) -> str: ...
+    def category(self, __chr: Text) -> str: ...
+    def combining(self, __chr: Text) -> int: ...
+    def decimal(self, __chr: Text, __default: _default=...) -> Union[int, _default]: ...
+    def decomposition(self, __chr: Text) -> str: ...
+    def digit(self, __chr: Text, __default: _default=...) -> Union[int, _default]: ...
+    def east_asian_width(self, __chr: Text) -> str: ...
+    def lookup(self, __name: Union[Text, bytes]) -> Text: ...
+    def mirrored(self, __chr: Text) -> int: ...
+    def name(self, __chr: Text, __default: _default=...) -> Union[Text, _default]: ...
+    def normalize(self, __form: Text, __unistr: Text) -> Text: ...
+    def numeric(self, __chr: Text, __default: _default=...) -> Union[float, _default]: ...