Merge pull request #1 from bosondata/upgrade/v0.2

更新行政区域代码201801

.bumpversion.cfg

@@ -1,6 +1,5 @@
 [bumpversion]
-files = setup.py gb2260/__init__.py
+files = setup.py gb2260_v2/__init__.py
 commit = True
 tag = True
-current_version = 0.4.1
-
+current_version = 0.2.0

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+omit = gb2260_v2/data/*

.gitignore

@@ -9,4 +9,6 @@ __pycache__
 /build
 /dist
 /htmlcov
-/gb2260/data.py
+/.idea
+/.python-version
+.pytest_cache/

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "data"]
-	path = data
-	url = https://github.com/cn/GB2260.git
+    path = data
+    url = https://github.com/cn/GB2260.git
+    branch = develop

.travis.yml

@@ -4,9 +4,10 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.7"
   - "pypy"
 install:
-  - "pip install pytest pytest-cov pytest-pep8 coveralls"
+  - "pip install pytest pytest-cov pytest-pep8 pytest-mock coveralls"
 script: "make clean test"
 after_success: "coveralls"
 branches:

Makefile

@@ -6,21 +6,17 @@ TOX := tox
 
 all: build
 
-build: gb2260/data.py
+build: gb2260_v2/data/__init__.py
 	$(PYTHON) setup.py sdist bdist_wheel
 
-test: gb2260/data.py
+test: gb2260_v2/data/__init__.py
 	$(PYTEST)
 
-test-all: gb2260/data.py
+test-all: gb2260_v2/data/__init__.py
 	$(TOX)
 
 clean:
-	rm -rf dist build gb2260/data.py
+	rm -rf dist build *.egg-info gb2260_v2/data/
 
-gb2260/data.py: data/GB2260*.txt
-	$(PYTHON) generate.py $? $@
-
-data/GB2260*.txt:
-	git submodule init
-	git submodule update
+gb2260_v2/data/__init__.py: data/revisions.json
+	$(PYTHON) generate.py $?

dev-requirements.txt

@@ -0,0 +1,6 @@
+-e.
+
+pytest
+pytest-cov
+pytest-pep8
+pytest-mock

gb2260_v2/.gitignore

@@ -0,0 +1 @@
+data/

gb2260_v2/__init__.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, unicode_literals
+
+from gb2260_v2.exceptions import (
+    GB2260Exception,
+    InvalidCode,
+    RevisionNotFound,
+    SourceNotFound,
+)
+from gb2260_v2.gb2260 import GB2260
+
+__all__ = [
+    'GB2260',
+    'GB2260Exception',
+    'InvalidCode',
+    'RevisionNotFound',
+    'SourceNotFound',
+]

gb2260_v2/_compat.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, unicode_literals
+
+import sys
+
+PY2 = sys.version_info[0] == 2
+
+if PY2:
+    text_type = unicode
+    binary_type = str
+
+    def iteritems(d):
+        return d.iteritems()
+else:
+    text_type = str
+    binary_type = bytes
+
+    def iteritems(d):
+        return d.items()
+
+
+def ensure_text(value, encoding):
+    if isinstance(value, text_type):
+        return value
+    return value.decode(encoding)
+
+
+def ensure_str(value, encoding):
+    if isinstance(value, str):
+        return value
+    if PY2:
+        return value.encode(encoding)
+    else:
+        return value.decode(encoding)