Merge pull request #193 from bact/dev

Small code refactor in pythainlp.tokenize.etcc, pythainlp.tokenize.tcc, pythainlp.util.date.thai_strftime(), and pythainlp.corpus.ttc

Author: bact

README-pypi.md

@@ -1,6 +1,6 @@
 ![PyThaiNLP Logo](https://avatars0.githubusercontent.com/u/32934255?s=200&v=4)
 
-# PyThaiNLP 2.0.2
+# PyThaiNLP 2.0.3
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/cb946260c87a4cc5905ca608704406f7)](https://www.codacy.com/app/pythainlp/pythainlp_2?utm_source=github.com&utm_medium=referral&utm_content=PyThaiNLP/pythainlp&utm_campaign=Badge_Grade)[![pypi](https://img.shields.io/pypi/v/pythainlp.svg)](https://pypi.python.org/pypi/pythainlp)
 [![Build Status](https://travis-ci.org/PyThaiNLP/pythainlp.svg?branch=develop)](https://travis-ci.org/PyThaiNLP/pythainlp)

bin/pythainlp

@@ -1,41 +1,46 @@
 #!python3
 # -*- coding: utf-8 -*-
+
+_VERSION = "2.0.3"
+
 import argparse
+
 parser = argparse.ArgumentParser()
-parser.add_argument("-t","--text",default=None, help="text",type=str)
-parser.add_argument("-seg", "--segment", help="word segment",action="store_true")
-parser.add_argument("-c", "--corpus", help="mange corpus",action="store_true")
-parser.add_argument("-pos", "--postag", help="postag",action="store_true")
-parser.add_argument("-soundex", "--soundex", help="soundex",default=None)
-parser.add_argument("-e","--engine",default="newmm", help="the engine",type=str)
-parser.add_argument("-pos-e","--postag_engine",default="perceptron", help="the engine for word tokenize",type=str)
-parser.add_argument("-pos-c","--postag_corpus",default="orchid", help="corpus for postag",type=str)
+parser.add_argument("-t", "--text", default=None, help="text", type=str)
+parser.add_argument("-seg", "--segment", help="word segment", action="store_true")
+parser.add_argument("-c", "--corpus", help="mange corpus", action="store_true")
+parser.add_argument("-pos", "--postag", help="postag", action="store_true")
+parser.add_argument("-soundex", "--soundex", help="soundex", default=None)
+parser.add_argument("-e", "--engine", default="newmm", help="the engine", type=str)
+parser.add_argument("-pos-e", "--postag_engine", default="perceptron", help="the engine for word tokenize", type=str)
+parser.add_argument("-pos-c", "--postag_corpus", default="orchid", help="corpus for postag", type=str)
 args = parser.parse_args()
+
 if args.corpus:
     from pythainlp.corpus import *
     print("PyThaiNLP Corpus")
     temp=""
     while temp!="exit":
-        print("\n\nPlease fill this out.\n1. install\n2. remove\n3. update\n4. exit\nex 1 or 2")
-        temp=input("input (1,2,3 or 4) : ")
+        print("\n1. Install\n2. Remove\n3. Update\n4. Exit\n")
+        temp=input("Choose 1, 2, 3, or 4: ")
         if temp=="1":
-            name=input("name corpus : ")
+            name=input("Corpus name:")
             download(name)
         elif temp=="2":
-            name=input("name corpus : ")
+            name=input("Corpus name:")
             remove(name)
         elif temp=="3":
-            name=input("name corpus : ")
+            name=input("Corpus name:")
             download(name)
         elif temp=="4":
             break
         else:
-            print("Please input 1,2,3 or 4.")
+            print("Choose 1, 2, 3, or 4:")
 elif args.text!=None:
     from pythainlp.tokenize import word_tokenize
-    tokens=word_tokenize(args.text,engine=args.engine)
+    tokens=word_tokenize(args.text, engine=args.engine)
     if args.segment:
-        print('|'.join(tokens))
+        print("|".join(tokens))
     elif args.postag:
         from pythainlp.tag import pos_tag
         print("\t".join([i[0]+"/"+i[1] for i in pos_tag(tokens, engine=args.postag_engine, corpus=args.postag_corpus)]))
@@ -45,4 +50,4 @@ elif args.soundex!=None:
         args.engine="lk82"
     print(soundex(args.soundex, engine=args.engine))
 else:
-    print("PyThaiNLP 2.0.2")
+    print(f"PyThaiNLP {_VERSION}")

conda.recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "2.0.2" %}
+{% set version = "2.0.3" %}
 
 package:
   name: pythainlp

docs/api/tokenize.rst

@@ -14,4 +14,4 @@ Modules
 .. autofunction:: sent_tokenize
 .. autofunction:: dict_trie
 .. autoclass:: Tokenizer
-   :members: word_tokenize,set_tokenize_engine
+   :members: word_tokenize, set_tokenize_engine

meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "2.0.2" %}
+{% set version = "2.0.3" %}
 
 package:
   name: pythainlp