Merge branch 'release/1.5.0'

Author: wuyue92tree

README.md

@@ -1,7 +1,7 @@
 # Crwy
 
 [![PyPI Version](https://img.shields.io/pypi/v/Crwy.svg)](https://pypi.python.org/pypi/Crwy)
-[![Build Status](https://travis-ci.org/wuyue92tree/crwy.svg?branch=1.4.0)](https://travis-ci.org/wuyue92tree/crwy)
+[![Build Status](https://travis-ci.org/wuyue92tree/crwy.svg?branch=1.5.0)](https://travis-ci.org/wuyue92tree/crwy)
 
 # 简介
 
@@ -34,7 +34,7 @@ pip install crwy
 ```
 
 or
-前往下载: https://pypi.python.org/pypi/Crwy/1.4.0/
+前往下载: https://pypi.python.org/pypi/Crwy/1.5.0/
 
 # 使用手册
 

crwy/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

crwy/commands/startproject.py

@@ -16,7 +16,11 @@
 LOG_PATH = os.path.join(PATH, 'log')
 CONFIG_PATH = os.path.join(PATH, 'crwy.cfg.tmpl')
 SETTINGS_PATH = os.path.join(PATH, 'settings.py.tmpl')
-LOGCONFIG_PATH = os.path.join(PATH, 'logger.conf.tmpl')
+
+if sys.version_info[0] == 2:
+    LOGCONFIG_PATH = os.path.join(PATH, 'logger_py2.conf.tmpl')
+else:
+    LOGCONFIG_PATH = os.path.join(PATH, 'logger_py3.conf.tmpl')
 
 
 class Command(object):

crwy/templates/project/logger.conf.tmpl …y/templates/project/logger_py2.conf.tmplcrwy/templates/project/logger.conf.tmpl renamed to crwy/templates/project/logger_py2.conf.tmpl crwy/templates/project/logger.conf.tmpl renamed to crwy/templates/project/logger_py2.conf.tmpl

@@ -48,7 +48,7 @@ args=('./log/default.log', 'a', 100*1024*1024, 10)
 class=handlers.TimedRotatingFileHandler
 level=DEBUG
 formatter=defaultFmt
-args=('./log/default.log', 'D', 1, 0)
+args=('./log/default.log', 'midnight', 1, 0)
 
 
 ###############################################

crwy/templates/project/logger_py3.conf.tmpl

@@ -0,0 +1,65 @@
+#logger.conf
+###############################################
+[loggers]
+keys=root,fileLogger,rtLogger,timedRtLogger
+
+[logger_root]
+level=INFO
+handlers=consoleHandler
+
+[logger_fileLogger]
+handlers=consoleHandler,fileHandler
+qualname=fileLogger
+propagate=0
+
+[logger_rtLogger]
+handlers=consoleHandler,rtHandler
+qualname=rtLogger
+propagate=0
+
+[logger_timedRtLogger]
+handlers=consoleHandler,timedRtHandler
+qualname=timedRtLogger
+propagate=0
+
+###############################################
+[handlers]
+keys=consoleHandler,fileHandler,rtHandler,timedRtHandler
+
+[handler_consoleHandler]
+class=StreamHandler
+level=INFO
+formatter=simpleFmt
+args=(sys.stderr,)
+
+[handler_fileHandler]
+class=FileHandler
+level=DEBUG
+formatter=defaultFmt
+args=('./log/default.log', 'a', 'utf-8')
+
+[handler_rtHandler]
+class=handlers.RotatingFileHandler
+level=DEBUG
+formatter=defaultFmt
+args=('./log/default.log', 'a', 100*1024*1024, 10, 'utf-8')
+
+[handler_timedRtHandler]
+class=handlers.TimedRotatingFileHandler
+level=DEBUG
+formatter=defaultFmt
+args=('./log/default.log', 'midnight', 1, 0, 'utf-8')
+
+
+###############################################
+
+[formatters]
+keys=defaultFmt,simpleFmt
+
+[formatter_defaultFmt]
+format=%(asctime)s %(filename)s %(funcName)s %(threadName)s [line:%(lineno)d] %(levelname)s %(message)s
+datefmt=%Y-%m-%d %H:%M:%S
+
+[formatter_simpleFmt]
+format=%(asctime)s %(filename)s %(funcName)s %(threadName)s [line:%(lineno)d] %(levelname)s %(message)s
+datefmt=%Y-%m-%d %H:%M:%S

crwy/utils/common.py

@@ -23,7 +23,7 @@
     'cookie2str', 'cookie2dict', 'config_handle',
     'file_handle', 'datetime2str', 'str2datetime',
     'dict2obj', 'obj2dict', 'remove_emoji', 'change_kv',
-    'remove_item_from_dict'
+    'remove_item_from_dict', 'splice_list'
 ]
 
 
@@ -174,3 +174,24 @@ def remove_item_from_dict(obj, keys_to_remove):
         if obj.get(key, ''):
             obj.pop(key)
     return obj
+
+
+def splice_list(obj_list, group_number=3):
+    """
+    分割列表
+    :param obj_list:
+    :param group_number:
+    :return:
+    """
+    if len(obj_list) < group_number:
+        raise Exception('obj_list length must greater than group_number.')
+
+    distance = int(len(obj_list) / group_number)
+    new_list = []
+    for group in range(group_number):
+        if group == group_number - 1:
+            # 若有超出部分并入最后一组
+            new_list.append(obj_list[distance*group:len(obj_list)])
+        else:
+            new_list.append(obj_list[distance*group:distance*(group+1)])
+    return new_list

crwy/utils/logger.py

@@ -4,20 +4,33 @@
 # Email: wuyue92tree@163.com
 
 
+import os
+import sys
 import logging
 import logging.config
 import logging.handlers
 from crwy.exceptions import CrwyException
+from crwy.settings.default_settings import TEMPLATE_DIR
 
 try:
-    import ConfigParser
+    import ConfigParser as configparser
 except ImportError:
-    from configparser import ConfigParser
+    import configparser
 
 DEFAULT_LOGGER_CONF = './conf/logger.conf'
 
+if sys.version_info[0] == 2:
+    BASE_LOGGER_CONF = os.path.join(
+        TEMPLATE_DIR, 'project/logger_py2.conf.tmpl')
+else:
+    BASE_LOGGER_CONF = os.path.join(
+        TEMPLATE_DIR, 'project/logger_py3.conf.tmpl')
+
 try:
-    logging.config.fileConfig(DEFAULT_LOGGER_CONF)
+    try:
+        logging.config.fileConfig(DEFAULT_LOGGER_CONF)
+    except KeyError:
+        logging.config.fileConfig(BASE_LOGGER_CONF)
 except:
     pass
 
@@ -54,7 +67,10 @@ def _install_handlers_custom(cp, formatters, log_path):
 
         if "level" in opts:
             level = cp.get(sectname, "level")
-            h.setLevel(logging._levelNames[level])
+            try:
+                h.setLevel(logging._levelNames[level])
+            except AttributeError:
+                h.setLevel(logging._nameToLevel[level])
         if len(fmt):
             h.setFormatter(formatters[fmt])
         if issubclass(klass, logging.handlers.MemoryHandler):
@@ -71,7 +87,7 @@ def _install_handlers_custom(cp, formatters, log_path):
     return handlers
 
 
-def fileConfigWithLogPath(fname=DEFAULT_LOGGER_CONF,
+def fileConfigWithLogPath(fname=BASE_LOGGER_CONF,
                           log_path=None,
                           defaults=None,
                           disable_existing_loggers=True):
@@ -81,14 +97,14 @@ def fileConfigWithLogPath(fname=DEFAULT_LOGGER_CONF,
     if not log_path:
         raise CrwyException('Please setup <log_path> first!')
 
-    cp = ConfigParser.ConfigParser(defaults)
+    cp = configparser.ConfigParser(defaults)
     if hasattr(fname, 'readline'):
-        cp.readfp(fname)
+        cp.read_file(fname)
     else:
         cp.read(fname)
     try:
         formatters = logging.config._create_formatters(cp)
-    except ConfigParser.NoSectionError:
+    except configparser.NoSectionError:
         raise CrwyException('Please make sure fname: "%s" is exist.' % fname)
 
     logging._acquireLock()