Rename metafieldtype to fieldtype

For consistency with flagtype. Also less redundant.

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index ed0e36960fa48f3b6379c5691acb3af4a2a9999e..977efb89aba499599fbc4524517857b36447cfd7 100644 (file)
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -107,7 +107,7 @@ def check_regexes(app):
     for f, checks in regex_checks.iteritems():
         for m, r in checks:
             v = app.get_field(f)
-            t = metadata.metafieldtype(f)
+            t = metadata.fieldtype(f)
             if t == metadata.TYPE_MULTILINE:
                 for l in v.splitlines():
                     if m.match(l):

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 58fcb9b05f95d356102f77a44a48015eefba7059..f39de762645abfa68238d1f70558002265c2e38d 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -223,7 +223,7 @@ fieldtypes = {
 }
 
 
-def metafieldtype(name):
+def fieldtype(name):
     if name in fieldtypes:
         return fieldtypes[name]
     return TYPE_STRING
@@ -1115,7 +1115,7 @@ def parse_txt_metadata(metadatapath):
             if f == 'Market Version Code':
                 f = 'Current Version Code'
 
-            ftype = metafieldtype(f)
+            ftype = fieldtype(f)
             if ftype not in [TYPE_BUILD, TYPE_BUILD_V2]:
                 add_comments(f)
             if ftype == TYPE_MULTILINE:
@@ -1273,7 +1273,7 @@ def write_txt_metadata(mf, app):
         mf.write("# %s\n" % line)
 
     def w_field(f, v):
-        t = metafieldtype(f)
+        t = fieldtype(f)
         if t == TYPE_LIST:
             v = ','.join(v)
         elif t == TYPE_MULTILINE:
@@ -1319,7 +1319,7 @@ def write_yaml_metadata(mf, app):
 
     def w_field(f, v, prefix='', t=None):
         if t is None:
-            t = metafieldtype(f)
+            t = fieldtype(f)
         v = ''
         if t == TYPE_LIST:
             v = '\n'