vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'develop' of https://github.com/frappe/frappe into link_title_refactor

Browse source
This commit is contained in:
Saqib Ansari 2022-01-18 09:52:30 +05:30
commit ea3ec5e2a7
26 changed files with 63 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/__init__.py
View file

@ -102,7 +102,7 @@ def as_unicode(text, encoding='utf-8'):
'''Convert to unicode if required'''
if isinstance(text, str):
return text
elif text==None:
elif text is None:
return ''
elif isinstance(text, bytes):
return str(text, encoding)
@ -294,7 +294,7 @@ def get_conf(site=None):
class init_site:
def __init__(self, site=None):
'''If site==None, initialize it for empty site ('') to load common_site_config.json'''
'''If site is None, initialize it for empty site ('') to load common_site_config.json'''
self.site = site or ''
def __enter__(self):
@ -1661,7 +1661,7 @@ def local_cache(namespace, key, generator, regenerate_if_none=False):
if key not in local.cache[namespace]:
local.cache[namespace][key] = generator()
elif local.cache[namespace][key]==None and regenerate_if_none:
elif local.cache[namespace][key] is None and regenerate_if_none:
# if key exists but the previous result was None
local.cache[namespace][key] = generator()

2
frappe/core/doctype/user/user.py
View file

@ -344,7 +344,7 @@ class User(Document):
frappe.sendmail(recipients=self.email, sender=sender, subject=subject,
template=template, args=args, header=[subject, "green"],
delayed=(not now) if now!=None else self.flags.delay_emails, retry=3)
delayed=(not now) if now is not None else self.flags.delay_emails, retry=3)
def a_system_manager_should_exist(self):
if not self.get_other_system_managers():

4
frappe/defaults.py
View file

@ -126,7 +126,7 @@ def set_default(key, value, parent, parenttype="__default"):
"defkey": key,
"parent": parent
})
if value != None:
if value is not None:
add_default(key, value, parent)
else:
_clear_cache(parent)
@ -187,7 +187,7 @@ def get_defaults_for(parent="__default"):
"""get all defaults"""
defaults = frappe.cache().hget("defaults", parent)
if defaults==None:
if defaults is None:
# sort descending because first default must get precedence
table = DocType("DefaultValue")
res = frappe.qb.from_(table).where(

2
frappe/desk/moduleview.py
View file

@ -524,7 +524,7 @@ def get_last_modified(doctype):
raise
# hack: save as -1 so that it is cached
if last_modified==None:
if last_modified is None:
last_modified = -1
return last_modified

2
frappe/desk/page/user_profile/user_profile.py
View file

@ -30,7 +30,7 @@ def get_energy_points_percentage_chart_data(user, field):
as_list = True)
return {
"labels": [r[0] for r in result if r[0] != None],
"labels": [r[0] for r in result if r[0] is not None],
"datasets": [{
"values": [r[1] for r in result]
}]

2
frappe/desk/search.py
View file

@ -109,7 +109,7 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
else:
filters.append([doctype, f[0], "=", f[1]])
if filters==None:
if filters is None:
filters = []
or_filters = []

4
frappe/model/base_document.py
View file

@ -172,7 +172,7 @@ class BaseDocument(object):
...
})
"""
if value==None:
if value is None:
value={}
if isinstance(value, (dict, BaseDocument)):
if not self.__dict__.get(key):
@ -272,7 +272,7 @@ class BaseDocument(object):
)):
d[fieldname] = str(d[fieldname])
if d[fieldname] == None and ignore_nulls:
if d[fieldname] is None and ignore_nulls:
del d[fieldname]
return d

2
frappe/model/db_query.py
View file

@ -545,7 +545,7 @@ class DatabaseQuery(object):
elif f.operator.lower() in ("like", "not like") or (isinstance(f.value, str) and
(not df or df.fieldtype not in ["Float", "Int", "Currency", "Percent", "Check"])):
value = "" if f.value==None else f.value
value = "" if f.value is None else f.value
fallback = "''"
if f.operator.lower() in ("like", "not like") and isinstance(value, str):

20
frappe/model/document.py
View file

@ -188,6 +188,8 @@ class Document(BaseDocument):
is not set.
:param permtype: one of `read`, `write`, `submit`, `cancel`, `delete`"""
import frappe.permissions
if self.flags.ignore_permissions:
return True
return frappe.permissions.has_permission(self.doctype, permtype, self, verbose=verbose)
@ -209,13 +211,13 @@ class Document(BaseDocument):
self.flags.notifications_executed = []
if ignore_permissions!=None:
if ignore_permissions is not None:
self.flags.ignore_permissions = ignore_permissions
if ignore_links!=None:
if ignore_links is not None:
self.flags.ignore_links = ignore_links
if ignore_mandatory!=None:
if ignore_mandatory is not None:
self.flags.ignore_mandatory = ignore_mandatory
self.set("__islocal", True)
@ -295,7 +297,7 @@ class Document(BaseDocument):
self.flags.notifications_executed = []
if ignore_permissions!=None:
if ignore_permissions is not None:
self.flags.ignore_permissions = ignore_permissions
self.flags.ignore_version = frappe.flags.in_test if ignore_version is None else ignore_version
@ -439,7 +441,7 @@ class Document(BaseDocument):
values = self.as_dict()
# format values
for key, value in values.items():
if value==None:
if value is None:
values[key] = ""
return values
@ -487,7 +489,7 @@ class Document(BaseDocument):
frappe.flags.currently_saving.append((self.doctype, self.name))
def set_docstatus(self):
if self.docstatus==None:
if self.docstatus is None:
self.docstatus=0
for d in self.get_all_children():
@ -885,14 +887,14 @@ class Document(BaseDocument):
if (frappe.flags.in_import and frappe.flags.mute_emails) or frappe.flags.in_patch or frappe.flags.in_install:
return
if self.flags.notifications_executed==None:
if self.flags.notifications_executed is None:
self.flags.notifications_executed = []
from frappe.email.doctype.notification.notification import evaluate_alert
if self.flags.notifications == None:
if self.flags.notifications is None:
alerts = frappe.cache().hget('notifications', self.doctype)
if alerts==None:
if alerts is None:
alerts = frappe.get_all('Notification', fields=['name', 'event', 'method'],
filters={'enabled': 1, 'document_type': self.doctype})
frappe.cache().hset('notifications', self.doctype, alerts)

2
frappe/model/dynamic_links.py
View file

@ -32,7 +32,7 @@ def get_dynamic_link_map(for_delete=False):
Note: Will not map single doctypes
'''
if getattr(frappe.local, 'dynamic_link_map', None)==None or frappe.flags.in_test:
if getattr(frappe.local, 'dynamic_link_map', None) is None or frappe.flags.in_test:
# Build from scratch
dynamic_link_map = {}
for df in get_dynamic_links():

1
frappe/patches.txt
View file

@ -123,6 +123,7 @@ frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
frappe.patches.v12_0.remove_example_email_thread_notify
execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
frappe.patches.v12_0.set_correct_url_in_files
frappe.patches.v13_0.remove_invalid_options_for_data_fields
frappe.patches.v13_0.website_theme_custom_scss
frappe.patches.v13_0.make_user_type
frappe.patches.v13_0.set_existing_dashboard_charts_as_public

2
frappe/patches/v11_0/remove_skip_for_doctype.py
View file

@ -33,7 +33,7 @@ def execute():
continue
skip_for_doctype = user_permission.skip_for_doctype.split('\n')
else: # while migrating from v10 -> v11
if skip_for_doctype_map.get((user_permission.allow, user_permission.user)) == None:
if skip_for_doctype_map.get((user_permission.allow, user_permission.user)) is None:
skip_for_doctype = get_doctypes_to_skip(user_permission.allow, user_permission.user)
# cache skip for doctype for same user and doctype
skip_for_doctype_map[(user_permission.allow, user_permission.user)] = skip_for_doctype

17
frappe/patches/v13_0/remove_invalid_options_for_data_fields.py Normal file
View file

@ -0,0 +1,17 @@
# Copyright (c) 2022, Frappe and Contributors
# License: MIT. See LICENSE
import frappe
from frappe.model import data_field_options
def execute():
custom_field = frappe.qb.DocType('Custom Field')
(frappe.qb
.update(custom_field)
.set(custom_field.options, None)
.where(
(custom_field.fieldtype == "Data")
& (custom_field.options.notin(data_field_options)))
).run()

4
frappe/permissions.py
View file

@ -559,7 +559,9 @@ def filter_allowed_docs_for_doctype(user_permissions, doctype, with_default_doc=
return (allowed_doc, default_doc) if with_default_doc else allowed_doc
def push_perm_check_log(log):
if frappe.flags.get('has_permission_check_logs') == None: return
if frappe.flags.get('has_permission_check_logs') is None:
return
frappe.flags.get('has_permission_check_logs').append(_(log))
def has_child_table_permission(child_doctype, ptype="read", child_doc=None,

6
frappe/sessions.py
View file

@ -112,7 +112,7 @@ def get_expired_sessions():
frappe.db.get_values(
sessions,
filters=(
PseudoColumn(f"({Now() - sessions.lastupdate})")
PseudoColumn(f"({Now()} - {sessions.lastupdate.get_sql()})")
> get_expiry_period_for_query(device)
)
& (sessions.device == device),
@ -334,7 +334,7 @@ class Session:
sessions,
filters=(sessions.sid == self.sid)
& (
PseudoColumn(f"({Now() - sessions.lastupdate})")
PseudoColumn(f"({Now()} - {sessions.lastupdate.get_sql()})")
< get_expiry_period_for_query(self.device)
),
fieldname=["user", "sessiondata"],
@ -374,7 +374,7 @@ class Session:
# database persistence is secondary, don't update it too often
updated_in_db = False
if force or (time_diff==None) or (time_diff > 600):
if force or (time_diff is None) or (time_diff > 600):
# update sessions table
frappe.db.sql("""update `tabSessions` set sessiondata=%s,
lastupdate=NOW() where sid=%s""" , (str(self.data['data']),

2
frappe/social/doctype/energy_point_rule/energy_point_rule.py
View file

@ -57,7 +57,7 @@ class EnergyPointRule(Document):
def rule_condition_satisfied(self, doc):
if self.for_doc_event == 'New':
# indicates that this was a new doc
return doc.get_doc_before_save() == None
return doc.get_doc_before_save() is None
if self.for_doc_event == 'Submit':
return doc.docstatus == 1
if self.for_doc_event == 'Cancel':

2
frappe/tests/test_twofactor.py
View file

@ -222,7 +222,7 @@ def disable_2fa():
def toggle_2fa_all_role(state=None):
'''Enable or disable 2fa for 'all' role on the system.'''
all_role = frappe.get_doc('Role','All')
if state == None:
if state is None:
state = False if all_role.two_factor_auth == True else False
if state not in [True, False]: return
all_role.two_factor_auth = cint(state)

2
frappe/translate.py
View file

@ -206,7 +206,7 @@ def make_dict_from_messages(messages, full_dict=None, load_user_translation=True
:param messages: List of untranslated messages
"""
out = {}
if full_dict==None:
if full_dict is None:
if load_user_translation:
full_dict = get_full_dict(frappe.local.lang)
else:

2
frappe/utils/__init__.py
View file

@ -290,7 +290,7 @@ def remove_blanks(d):
"""
empty_keys = []
for key in d:
if d[key]=='' or d[key]==None:
if d[key] == "" or d[key] is None:
# del d[key] raises runtime exception, using a workaround
empty_keys.append(key)
for key in empty_keys:

2
frappe/utils/csvutils.py
View file

@ -112,7 +112,7 @@ def check_record(d):
docfield = doc.meta.get_field(key)
val = d[key]
if docfield:
if docfield.reqd and (val=='' or val==None):
if docfield.reqd and (val=='' or val is None):
frappe.msgprint(_("{0} is required").format(docfield.label), raise_exception=1)
if docfield.fieldtype=='Select' and val and docfield.options:

2
frappe/utils/data.py
View file

@ -129,7 +129,7 @@ def add_to_date(date, years=0, months=0, weeks=0, days=0, hours=0, minutes=0, se
from dateutil.parser._parser import ParserError
from dateutil.relativedelta import relativedelta
if date==None:
if date is None:
date = now_datetime()
if hours:

2
frappe/utils/minify.py
View file

@ -70,7 +70,7 @@ class JavascriptMinify(object):
"""
c = self.theLookahead
self.theLookahead = None
if c == None:
if c is None:
c = self.instream.read(1)
if c >= ' ' or c == '\n':
return c

2
frappe/website/doctype/web_form/web_form.py
View file

@ -305,7 +305,7 @@ def get_context(context):
if not section:
section = add_section()
column = None
if column==None:
if column is None:
column = add_column()
column.append(df)

2
frappe/website/utils.py
View file

@ -301,7 +301,7 @@ def get_html_content_based_on_type(doc, fieldname, content_type):
elif content_type == 'HTML':
content = doc.get(fieldname + '_html')
if content == None:
if content is None:
content = ''
return content

2
package.json
View file

@ -37,7 +37,7 @@
"fast-deep-equal": "^2.0.1",
"frappe-charts": "^2.0.0-rc13",
"frappe-datatable": "^1.16.0",
"frappe-gantt": "^0.5.0",
"frappe-gantt": "^0.6.0",
"fuse.js": "^3.4.6",
"highlight.js": "^10.4.1",
"html5-qrcode": "^2.0.11",

8
yarn.lock
View file

@ -1610,10 +1610,10 @@ frappe-datatable@^1.16.0:
lodash "^4.17.5"
sortablejs "^1.7.0"
frappe-gantt@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/frappe-gantt/-/frappe-gantt-0.5.0.tgz#4dc7aa125f318efea64b4ae0e38f67a720238c1d"
integrity sha512-RAskVuBmnTcPJXh87oVhYmnNGy/9lvZlLHGui8QFB8yRBuUjzpZoZfZ+hKmDtBDmWNrE2/LRta06W5WmhTzzWQ==
frappe-gantt@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/frappe-gantt/-/frappe-gantt-0.6.0.tgz#fece2fdecc0b8d6065d3c420d9681b719b827047"
integrity sha512-/P7s9edP6EoLD09EX2HPqsy1u0v4zYcurMy4ByExArvj7t0UDJlpxp88nISFtMkQe+aofaO9dR0fd61ZwX0O6g==
fresh@0.5.2:
version "0.5.2"