Incorporate downstream CEGID changes. (#71)

* Correct GEOHAYSTACK removal. Fixes #65.
* Version bump.
* Version pin updates.
* Namespace packaging change for Python 3.
* Remove Python 2 stubs.
* Compatibility module removals.
* Remove Python 2 future-compatibility module preambles.
* Python 3 typing module movement.
* collections->typing module movement.
* Clean up tests.
* Add subclass derivation tests.

Author: amcgregor

.travis.yml

@@ -1,16 +1,12 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
-from collections import MutableMapping
+from collections import OrderedDict as odict
+from typing import MutableMapping
 
 from bson import ObjectId
 from bson.json_util import dumps, loads
 
 from ...package.loader import load
 from ...package.canonical import name as named
 from ...schema import Attributes, Container
-from ...schema.compat import str, unicode, odict
 from ..util import SENTINEL
 from .field import Field
 from .field.alias import Alias
@@ -137,8 +133,8 @@ def __repr__(self, *args, **kw):
 			pk = getattr(self, self.__pk__, None)
 
 			if isinstance(pk, ObjectId):
-				pk = unicode(pk)
-			elif isinstance(pk, (str, unicode)):
+				pk = str(pk)
+			elif isinstance(pk, str):
 				pass
 			else:
 				pk = repr(pk)

marrow/__init__.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from warnings import warn
 from weakref import proxy
 

marrow/mongo/core/document.py

@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
-from collections import Iterable, Mapping
+from typing import Iterable, Mapping
 
 from ... import Field
 from .base import _HasKind, _CastingKind

marrow/mongo/core/field/alias.py

@@ -10,7 +10,6 @@
 from ....schema import Attribute
 from ....schema.transform import BaseTransform
 from ....schema.validate import Validator
-from ....schema.compat import str, unicode, py3
 from ...query import Q
 from ...util import adjust_attribute_sequence, SENTINEL
 
@@ -192,13 +191,8 @@ def __delete__(self, obj):
 
 	# Other Python Protocols
 
-	def __unicode__(self):
+	def __str__(self):
 		return self.__name__
-	
-	if py3:
-		__str__ = __unicode__
-		del __unicode__
-
 
 
 
@@ -229,12 +223,12 @@ def __fixup__(self, document):
 	def _kind(self, document=None):
 		kind = self.kind
 
-		if isinstance(kind, (str, unicode)):
+		if isinstance(kind, str):
 			if kind.startswith('.'):
 				# This allows the reference to be dynamic.
 				kind = traverse(document or self.__document__, kind[1:])
 
-				if not isinstance(kind, (str, unicode)):
+				if not isinstance(kind, str):
 					return kind
 			else:
 				kind = load(kind, 'marrow.mongo.document')

marrow/mongo/core/field/array.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from .base import Field
 
 

marrow/mongo/core/field/base.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from .base import Field
 from ....schema import Attribute
 

marrow/mongo/core/field/binary.py

@@ -1,18 +1,14 @@
-# encoding: utf-8
-
 """Marrow Mongo Date field specialization.
 
 Commentary on high-level management of timezone casting:
 
 	https://groups.google.com/forum/#!topic/mongodb-user/GOMjTJON4cg
 """
 
-from __future__ import unicode_literals
-
-from datetime import datetime, timedelta, tzinfo
 from bson import ObjectId as OID
-from collections import MutableMapping
 from datetime import datetime, timedelta
+from datetime import datetime, timedelta, tzinfo
+from typing import MutableMapping
 
 from .base import Field
 from ...util import utc, utcnow

marrow/mongo/core/field/boolean.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from decimal import Decimal as dec, localcontext
 
 from .number import Number

marrow/mongo/core/field/date.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from .number import Number
 
 

marrow/mongo/core/field/decimal_.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from .base import _HasKind, _CastingKind, Field
 
 

marrow/mongo/core/field/double.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from .number import Number
 
 

marrow/mongo/core/field/embed.py

@@ -1,12 +1,7 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from uri import URI
 
 from .string import String
 from ....schema import Attribute
-from ....schema.compat import unicode
 
 
 class Link(String):
@@ -34,13 +29,13 @@ class Link(String):
 	def to_foreign(self, obj, name, value):  # pylint:disable=unused-argument
 		value = self.URI(value)
 
-		if self.protocols and unicode(value.scheme) not in self.protocols:
+		if self.protocols and str(value.scheme) not in self.protocols:
 			raise ValueError("Link utilizes invaid scheme: " + repr(value.scheme))
 
 		if self.absolute and value.relative:
 			raise ValueError("Link must be absolute.")
 
-		return unicode(value)
+		return str(value)
 
 	def to_native(self, obj, name, value):  # pylint:disable=unused-argument
 		return self.URI(value)

marrow/mongo/core/field/integer.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from bson.int64 import Int64
 
 from .number import Number

marrow/mongo/core/field/link.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from collections import OrderedDict, Mapping as _Mapping
 
 from ....schema import Attribute

marrow/mongo/core/field/long_.py

@@ -1,13 +1,8 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from misaka import Markdown, HtmlRenderer  # , SmartyPants
 from misaka import HTML_ESCAPE, HTML_HARD_WRAP
 from misaka import EXT_FENCED_CODE, EXT_NO_INTRA_EMPHASIS, EXT_AUTOLINK, EXT_SPACE_HEADERS, EXT_STRIKETHROUGH, EXT_SUPERSCRIPT
 
 from .string import String
-from ....schema.compat import unicode, py3
 
 
 md = Markdown(
@@ -21,7 +16,7 @@
 	)
 
 
-class MarkdownString(unicode):
+class MarkdownString(str):
 	def __html__(self):
 		return md(self)
 

marrow/mongo/core/field/mapping.py

@@ -1,11 +1,6 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from numbers import Number as NumberABC
 
 from .base import Field
-from ....schema.compat import unicode
 
 
 class Number(Field):
@@ -16,7 +11,7 @@ def to_foreign(self, obj, name, value):  # pylint:disable=unused-argument
 		if isinstance(value, NumberABC):
 			return value
 
-		if isinstance(value, unicode):
+		if isinstance(value, str):
 			if value.isnumeric():
 				return int(value)
 			else:

marrow/mongo/core/field/md.py

@@ -1,14 +1,9 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from bson import ObjectId as OID
-from collections import MutableMapping
 from datetime import datetime, timedelta
+from typing import MutableMapping
 
 from .base import Field
 from ....schema import Attribute
-from ....schema.compat import unicode
 
 
 class ObjectId(Field):
@@ -39,4 +34,4 @@ def to_foreign(self, obj, name, value):  # pylint:disable=unused-argument
 		if isinstance(value, MutableMapping) and '_id' in value:
 			return OID(value['_id'])
 
-		return OID(unicode(value))
+		return OID(str(value))

marrow/mongo/core/field/number.py

@@ -1,14 +1,6 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
+from pathlib import PurePosixPath as _Path
 
 from .string import String
-from ....schema.compat import unicode, py3
-
-try:
-	from pathlib import PurePosixPath as _Path
-except ImportError:
-	from pathlib2 import PurePosixPath as _Path
 
 
 class Path(String):

marrow/mongo/core/field/oid.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from datetime import timedelta
 
 from .date import Date

marrow/mongo/core/field/path.py

@@ -1,13 +1,8 @@
-# encoding: utf-8
-
-from __future__ import unicode_literals
-
 from pkg_resources import iter_entry_points
 
 from ....package.canonical import name as canon
 from ....package.loader import load
 from ....schema import Attribute
-from ....schema.compat import str, unicode
 
 from .base import Field
 
@@ -52,7 +47,7 @@ def to_foreign(self, obj, name, value):  # pylint:disable=unused-argument
 		except AttributeError:
 			explicit = not namespace
 
-		if not isinstance(value, (str, unicode)):
+		if not isinstance(value, (str, bytes)):
 			value = canon(value)
 
 		if namespace and ':' in value:  # Try to reduce to a known plugin short name.