From 06a50b0178eb826b845cac96681d7ee028a0b5be Mon Sep 17 00:00:00 2001
From: Emmanuelle Vargas-Gonzalez <emmanuelle@mitre.org>
Date: Wed, 1 Nov 2017 10:48:28 -0400
Subject: [PATCH] Update README, add DEFAULT_VERSION

---
 README.rst                  |  5 +++--
 docs/guide/ts_support.ipynb |  2 +-
 stix2/__init__.py           |  4 +++-
 stix2/core.py               | 10 +++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index c2ec908..7884ba0 100644
--- a/README.rst
+++ b/README.rst
@@ -65,8 +65,9 @@ For more in-depth documentation, please see `https://stix2.readthedocs.io/ <http
 STIX 2.X Technical Specification Support
 ----------------------------------------
 
-The `stix2` Python library is built to support multiple versions of the STIX
-Technical Specification. With every major release of stix2 the ``import stix2``
+This version of python-stix2 supports STIX 2.0 by default. Although, the `stix2`
+Python library is built to support multiple versions of the STIX Technical
+Specification. With every major release of stix2 the ``import stix2``
 statement will automatically load the SDO/SROs equivalent to the most recent
 supported 2.X Technical Specification. Please see the library documentation
 for more details.
diff --git a/docs/guide/ts_support.ipynb b/docs/guide/ts_support.ipynb
index d353dfb..f98d7b5 100644
--- a/docs/guide/ts_support.ipynb
+++ b/docs/guide/ts_support.ipynb
@@ -203,7 +203,7 @@
    "source": [
     "### How will custom work\n",
     "\n",
-    "CustomObjects, CustomObservable, CustomMarking and CustomExtensions must be registered explicitly by STIX version. This is a design decision since properties or requirements may change as the STIX Technical Specification advances.\n",
+    "CustomObject, CustomObservable, CustomMarking and CustomExtension must be registered explicitly by STIX version. This is a design decision since properties or requirements may change as the STIX Technical Specification advances.\n",
     "\n",
     "You can perform this by,"
    ]
diff --git a/stix2/__init__.py b/stix2/__init__.py
index 99c70fc..7ba3e99 100644
--- a/stix2/__init__.py
+++ b/stix2/__init__.py
@@ -49,7 +49,9 @@ from .sources.memory import MemorySink, MemorySource, MemoryStore
 from .sources.taxii import (TAXIICollectionSink, TAXIICollectionSource,
                             TAXIICollectionStore)
 from .utils import get_dict, new_version, revoke
-from .v20 import *  # This import should always be the latest STIX 2.X version
+from .v20 import *  # This import will always be the latest STIX 2.X version
 from .version import __version__
 
 _collect_stix2_obj_maps()
+
+DEFAULT_VERSION = "2.0"  # Default version will always be the latest STIX 2.X version
diff --git a/stix2/core.py b/stix2/core.py
index 5341b1d..e860e95 100644
--- a/stix2/core.py
+++ b/stix2/core.py
@@ -4,7 +4,7 @@ from collections import OrderedDict
 import importlib
 import pkgutil
 
-from . import exceptions
+from . import DEFAULT_VERSION, exceptions
 from .base import _STIXBase
 from .properties import IDProperty, ListProperty, Property, TypeProperty
 from .utils import get_dict
@@ -78,11 +78,11 @@ def parse(data, allow_custom=False, version=None):
     """
     if not version:
         # Use latest version
-        OBJ_MAP = STIX2_OBJ_MAPS[sorted(STIX2_OBJ_MAPS.keys())[-1]]
+        v = 'v' + DEFAULT_VERSION.replace('.', '')
     else:
         v = 'v' + version.replace('.', '')
-        OBJ_MAP = STIX2_OBJ_MAPS[v]
 
+    OBJ_MAP = STIX2_OBJ_MAPS[v]
     obj = get_dict(data)
 
     if 'type' not in obj:
@@ -105,11 +105,11 @@ def _register_type(new_type, version=None):
     """
     if not version:
         # Use latest version
-        OBJ_MAP = STIX2_OBJ_MAPS[sorted(STIX2_OBJ_MAPS.keys())[-1]]
+        v = 'v' + DEFAULT_VERSION.replace('.', '')
     else:
         v = 'v' + version.replace('.', '')
-        OBJ_MAP = STIX2_OBJ_MAPS[v]
 
+    OBJ_MAP = STIX2_OBJ_MAPS[v]
     OBJ_MAP[new_type._type] = new_type