Merge pull request #4 from majiidd/develop

Develop

.appveyor.yml

@@ -1,4 +1,4 @@
-version: '1.5.0.{build}'
+version: '1.5.1.{build}'
 
 environment:
   matrix:
@@ -42,6 +42,14 @@ environment:
       PYTHON_VERSION: 3.8
       PYTHON_ARCH: 64
 
+    - PYTHON: C:\Python39
+      PYTHON_VERSION: 3.9
+      PYTHON_ARCH: 32
+
+    - PYTHON: C:\Python39-x64
+      PYTHON_VERSION: 3.9
+      PYTHON_ARCH: 64
+
 init:
   - ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%
 

.travis.yml

@@ -1,15 +1,16 @@
-dist: xenial
+os: linux
+dist: bionic
 language: python
 python:
   - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
-  - "3.9-dev"
-  - "pypy"
+  - "3.9"
+  - "3.10-dev"
+  - "pypy2"
   - "pypy3"
-  - "pypy3.5"
 
 install:
   - python -c "import sys, platform, struct;

MANIFEST.in

@@ -1 +1 @@
-include README.md
+include LICENSE README.md

README.md

@@ -18,8 +18,9 @@
 ## Install Package
 
 ```{.sourceCode .bash}
-pip install persiantools
+python -m pip install persiantools
 ```
+Persiantools supports Python 2.7 & 3.5+.
 
 ## How to use
 

persiantools/__init__.py

@@ -9,7 +9,7 @@
 
 __title__ = "persiantools"
 __url__ = "https://github.com/majiidd/persiantools"
-__version__ = "1.5.0"
+__version__ = "1.5.1"
 __build__ = __version__
 __author__ = "Majid Hajiloo"
 __author_email__ = "majid.hajiloo@gmail.com"

persiantools/jdatetime.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import sys
 from datetime import date, timedelta, tzinfo, time as _time, datetime as dt
+import operator
 
 from persiantools import digits, utils, PY2
 
@@ -160,9 +161,9 @@ def locale(self, locale):
 
     @classmethod
     def _check_date_fields(cls, year, month, day, locale):
-        year = utils.check_int_field(year)
-        month = utils.check_int_field(month)
-        day = utils.check_int_field(day)
+        year = operator.index(year)
+        month = operator.index(month)
+        day = operator.index(day)
 
         if not MINYEAR <= year <= MAXYEAR:
             raise ValueError("year must be in %d..%d" % (MINYEAR, MAXYEAR), year)

persiantools/utils.py

@@ -13,23 +13,3 @@ def replace(string, dictionary):
 
     pattern = re.compile("|".join(dictionary.keys()))
     return pattern.sub(lambda x: dictionary[x.group()], string)
-
-
-def check_int_field(value):
-    if isinstance(value, int):
-        return value
-
-    if not isinstance(value, float):
-        try:
-            value = value.__int__()
-        except AttributeError:
-            pass
-        else:
-            if isinstance(value, int):
-                return value
-
-            raise TypeError("__int__ returned non-int (type %s)" % type(value).__name__)
-
-        raise TypeError("an integer is required (got type %s)" % type(value).__name__)
-
-    raise TypeError("integer argument expected, got float")

requirements.txt

@@ -1,4 +1,4 @@
-coverage==5.2.1
+coverage==5.3
 pytest==4.6.11
-pytest-cov==2.10.0
+pytest-cov==2.10.1
 pytz==2020.1

setup.py

@@ -34,6 +34,7 @@ def readme():
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
+        "Topic :: Software Development",
         "Topic :: Software Development :: Libraries",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Software Development :: Localization",

tests/test_utils.py

@@ -22,12 +22,3 @@ def test_replace(self):
             ),
             u"اایی بس که نباشیم و جهان خخووااههدد بود",
         )
-
-    def test_int(self):
-        self.assertEqual(utils.check_int_field(100010001), 100010001)
-
-        with pytest.raises(TypeError):
-            utils.check_int_field(1111.9999)
-
-        with pytest.raises(TypeError):
-            utils.check_int_field("1000")