Change to use pysnippets
Brightcells
3 fichiers modifiés avec 14 ajouts et 18 suppressions
+ 13
- 13
operation/admin.py
@@ -3,13 +3,13 @@ |
||
| 3 | 3 |
from django.conf import settings |
| 4 | 4 |
from django.contrib import admin |
| 5 | 5 |
from django.template.loader import render_to_string |
| 6 |
+from pysnippets.strsnippets import strip |
|
| 6 | 7 |
|
| 7 | 8 |
from operation.models import APPSettingsInfo, FeedbackInfo, GuestEntranceControlInfo, LatestAppInfo, SplashInfo |
| 8 | 9 |
from utils.disk_utils import write_to_disk |
| 9 | 10 |
from utils.redis.rapp import set_latest_app |
| 10 | 11 |
from utils.redis.rguest import delete_guest_entrance_control, set_guest_entrance_control |
| 11 | 12 |
from utils.redis.rsettings import del_app_settings_info, set_app_settings_info |
| 12 |
-from utils.strip_utils import tstrip |
|
| 13 | 13 |
|
| 14 | 14 |
|
| 15 | 15 |
class LatestAppInfoAdmin(admin.ModelAdmin): |
@@ -17,12 +17,12 @@ class LatestAppInfoAdmin(admin.ModelAdmin): |
||
| 17 | 17 |
list_filter = ('src', 'status')
|
| 18 | 18 |
|
| 19 | 19 |
def save_model(self, request, obj, form, change): |
| 20 |
- obj.latest_adr_version_code = tstrip(obj.latest_adr_version_code) |
|
| 21 |
- obj.latest_adr_version_name = tstrip(obj.latest_adr_version_name) |
|
| 22 |
- obj.latest_adr_app = tstrip(obj.latest_adr_app) |
|
| 23 |
- obj.latest_ios_version_code = tstrip(obj.latest_ios_version_code) |
|
| 24 |
- obj.latest_ios_version_name = tstrip(obj.latest_ios_version_name) |
|
| 25 |
- obj.latest_ios_url = tstrip(obj.latest_ios_url) |
|
| 20 |
+ obj.latest_adr_version_code = strip(obj.latest_adr_version_code) |
|
| 21 |
+ obj.latest_adr_version_name = strip(obj.latest_adr_version_name) |
|
| 22 |
+ obj.latest_adr_app = strip(obj.latest_adr_app) |
|
| 23 |
+ obj.latest_ios_version_code = strip(obj.latest_ios_version_code) |
|
| 24 |
+ obj.latest_ios_version_name = strip(obj.latest_ios_version_name) |
|
| 25 |
+ obj.latest_ios_url = strip(obj.latest_ios_url) |
|
| 26 | 26 |
obj.save() |
| 27 | 27 |
|
| 28 | 28 |
if obj.src == LatestAppInfo.PAIAI_USER: |
@@ -73,8 +73,8 @@ class APPSettingsInfoAdmin(admin.ModelAdmin): |
||
| 73 | 73 |
list_filter = ('platform', 'online', 'status')
|
| 74 | 74 |
|
| 75 | 75 |
def save_model(self, request, obj, form, change): |
| 76 |
- obj.channel = tstrip(obj.channel) |
|
| 77 |
- obj.version = tstrip(obj.version) |
|
| 76 |
+ obj.channel = strip(obj.channel) |
|
| 77 |
+ obj.version = strip(obj.version) |
|
| 78 | 78 |
obj.save() |
| 79 | 79 |
|
| 80 | 80 |
# 设置 APP 设置信息 |
@@ -101,10 +101,10 @@ class GuestEntranceControlInfoAdmin(admin.ModelAdmin): |
||
| 101 | 101 |
list_display = ('platform', 'min_adr', 'max_adr', 'min_ios', 'max_ios', 'status', 'created_at', 'updated_at')
|
| 102 | 102 |
|
| 103 | 103 |
def save_model(self, request, obj, form, change): |
| 104 |
- obj.min_adr = tstrip(obj.min_adr) |
|
| 105 |
- obj.max_adr = tstrip(obj.max_adr) |
|
| 106 |
- obj.min_ios = tstrip(obj.min_ios) |
|
| 107 |
- obj.max_ios = tstrip(obj.max_ios) |
|
| 104 |
+ obj.min_adr = strip(obj.min_adr) |
|
| 105 |
+ obj.max_adr = strip(obj.max_adr) |
|
| 106 |
+ obj.min_ios = strip(obj.min_ios) |
|
| 107 |
+ obj.max_ios = strip(obj.max_ios) |
|
| 108 | 108 |
obj.save() |
| 109 | 109 |
|
| 110 | 110 |
# 设置游客入口控制 |
+ 1
- 0
requirements.txt
@@ -27,6 +27,7 @@ isoweek==1.3.1 |
||
| 27 | 27 |
jsonfield==1.0.3 |
| 28 | 28 |
mock==2.0.0 |
| 29 | 29 |
pep8==1.7.0 |
| 30 |
+pysnippets==1.0.4 |
|
| 30 | 31 |
pywe-miniapp==1.0.0 |
| 31 | 32 |
pywe-oauth==1.0.2 |
| 32 | 33 |
pywe-response==1.0.0 |
+ 0
- 5
utils/strip_utils.py
@@ -1,5 +0,0 @@ |
||
| 1 |
-# -*- coding: utf-8 -*- |
|
| 2 |
- |
|
| 3 |
- |
|
| 4 |
-def tstrip(s): |
|
| 5 |
- return s.strip() if isinstance(s, basestring) else s |