Prefer literals throughout project

jdufresne · jdufresne · commit bb802b60d93c · 2017-12-11T21:44:11.000-08:00
- Use a dict literal instead of calling dict().
- Use a list literal instead of calling list().
- Use a set literal instead of calling set().
- Use a tuple literal instead of calling tuple().
- Use dict comprehension

These syntax expressions are available by all supported Python versions.
Literals are always faster than calling the constructor. More idiomatic
with wider Python community.
diff --git a/Demo/pyasn1/syncrepl.py b/Demo/pyasn1/syncrepl.py
@@ -45,9 +45,9 @@ def __init__(self, db_path, *args, **kwargs):
         if db_path:
             self.__data = shelve.open(db_path, 'c')
         else:
-            self.__data = dict()
+            self.__data = {}
         # We need this for later internal use
-        self.__presentUUIDs = dict()
+        self.__presentUUIDs = {}
 
     def close_db(self):
         # Close the data store properly to avoid corruption
@@ -64,7 +64,7 @@ def syncrepl_entry(self, dn, attributes, uuid):
         logger.debug('dn=%r attributes=%r uuid=%r', dn, attributes, uuid)
         # First we determine the type of change we have here
         # (and store away the previous data for later if needed)
-        previous_attributes = dict()
+        previous_attributes = {}
         if uuid in self.__data:
             change_type = 'modify'
             previous_attributes = self.__data[uuid]
diff --git a/Lib/ldap/asyncsearch.py b/Lib/ldap/asyncsearch.py
@@ -8,16 +8,16 @@
 
 from ldap import __version__
 
-SEARCH_RESULT_TYPES = set([
+SEARCH_RESULT_TYPES = {
   ldap.RES_SEARCH_ENTRY,
   ldap.RES_SEARCH_RESULT,
   ldap.RES_SEARCH_REFERENCE,
-])
+}
 
-ENTRY_RESULT_TYPES = set([
+ENTRY_RESULT_TYPES = {
   ldap.RES_SEARCH_ENTRY,
   ldap.RES_SEARCH_RESULT,
-])
+}
 
 
 class WrongResultType(Exception):
@@ -207,7 +207,7 @@ class IndexedDict(Dict):
 
   def __init__(self,l,indexed_attrs=None):
     Dict.__init__(self,l)
-    self.indexed_attrs = indexed_attrs or tuple()
+    self.indexed_attrs = indexed_attrs or ()
     self.index = {}.fromkeys(self.indexed_attrs,{})
 
   def _processSingleResult(self,resultType,resultItem):
diff --git a/Lib/ldap/controls/deref.py b/Lib/ldap/controls/deref.py
@@ -107,10 +107,10 @@ def decodeControlValue(self,encodedControlValue):
     self.derefRes = {}
     for deref_res in decodedValue:
       deref_attr,deref_val,deref_vals = deref_res[0],deref_res[1],deref_res[2]
-      partial_attrs_dict = dict([
-        (str(tv[0]),map(str,tv[1]))
+      partial_attrs_dict = {
+        str(tv[0]): map(str,tv[1])
         for tv in deref_vals or []
-      ])
+      }
       try:
         self.derefRes[str(deref_attr)].append((str(deref_val),partial_attrs_dict))
       except KeyError:
diff --git a/Lib/ldap/controls/psearch.py b/Lib/ldap/controls/psearch.py
@@ -32,7 +32,7 @@
   'modify':4,
   'modDN':8,
 }
-CHANGE_TYPES_STR = dict([(v,k) for k,v in CHANGE_TYPES_INT.items()])
+CHANGE_TYPES_STR = {v: k for k,v in CHANGE_TYPES_INT.items()}
 
 
 class PersistentSearchControl(RequestControl):
diff --git a/Lib/ldap/ldapobject.py b/Lib/ldap/ldapobject.py
@@ -227,10 +227,10 @@ def _bytesify_result_value(self, result_value):
       return result_value
     if hasattr(result_value, 'items'):
       # It's a attribute_name: [values] dict
-      return dict(
-        (self._maybe_rebytesify_text(key), value)
+      return {
+        self._maybe_rebytesify_text(key): value
         for (key, value) in result_value.items()
-      )
+      }
     elif isinstance(result_value, bytes):
       return result_value
     else:
@@ -991,13 +991,13 @@ class ReconnectLDAPObject(SimpleLDAPObject):
   application.
   """
 
-  __transient_attrs__ = set([
+  __transient_attrs__ = {
     '_l',
     '_ldap_object_lock',
     '_trace_file',
     '_reconnect_lock',
     '_last_bind',
-  ])
+  }
 
   def __init__(
     self,uri,
@@ -1025,11 +1025,11 @@ def __init__(
 
   def __getstate__(self):
     """return data representation for pickled object"""
-    state = dict([
-        (k,v)
+    state = {
+        k: v
         for k,v in self.__dict__.items()
         if k not in self.__transient_attrs__
-    ])
+    }
     state['_last_bind'] = self._last_bind[0].__name__, self._last_bind[1], self._last_bind[2]
     return state
 
diff --git a/Lib/ldap/schema/models.py b/Lib/ldap/schema/models.py
@@ -11,7 +11,7 @@
 
 from ldap.schema.tokenizer import split_tokens,extract_tokens
 
-NOT_HUMAN_READABLE_LDAP_SYNTAXES = set([
+NOT_HUMAN_READABLE_LDAP_SYNTAXES = {
   '1.3.6.1.4.1.1466.115.121.1.4',  # Audio
   '1.3.6.1.4.1.1466.115.121.1.5',  # Binary
   '1.3.6.1.4.1.1466.115.121.1.8',  # Certificate
@@ -21,7 +21,7 @@
   '1.3.6.1.4.1.1466.115.121.1.28', # JPEG
   '1.3.6.1.4.1.1466.115.121.1.40', # Octet String
   '1.3.6.1.4.1.1466.115.121.1.49', # Supported Algorithm
-])
+}
 
 
 class SchemaElement:
diff --git a/Lib/ldap/syncrepl.py b/Lib/ldap/syncrepl.py
@@ -323,7 +323,7 @@ def __init__(self, encodedMessage):
                     self.newcookie = str(comp)
                     return
 
-                val = dict()
+                val = {}
 
                 cookie = comp.getComponentByName('cookie')
                 if cookie.hasValue():
diff --git a/Lib/ldif.py b/Lib/ldif.py
@@ -69,7 +69,7 @@ def list_dict(l):
   """
   return a dictionary with all items of l being the keys of the dictionary
   """
-  return dict([(i,None) for i in l])
+  return {i: None for i in l}
 
 
 class LDIFWriter:
diff --git a/Tests/t_ldap_syncrepl.py b/Tests/t_ldap_syncrepl.py
@@ -247,7 +247,7 @@ def syncrepl_present(self, uuids, refreshDeletes=False):
             self.present.extend(uuids)
 
         elif (uuids is None) and (refreshDeletes is False):
-            deleted_uuids = list()
+            deleted_uuids = []
             for uuid in self.uuid_dn.keys():
                 if uuid not in self.present:
                     deleted_uuids.append(uuid)
diff --git a/setup.py b/setup.py
@@ -71,18 +71,18 @@ class OpenLDAP2:
 # setup() in a fashion that doesn't break compatibility  to
 # distutils. This still allows 'normal' builds where either
 # Python > 2.3.5 or setuptools (or both ;o) are not available.
-kwargs = dict()
+kwargs = {}
 if has_setuptools:
-  kwargs = dict(
-    include_package_data = True,
-    install_requires = [
+  kwargs = {
+    'include_package_data': True,
+    'install_requires': [
         'setuptools',
         'pyasn1 >= 0.3.7',
         'pyasn1_modules >= 0.1.5',
     ],
-    zip_safe = False,
-    python_requires = '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
-  )
+    'zip_safe': False,
+    'python_requires': '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
+  }
 
 setup(
   #-- Package description

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`'modify':4,`
`33`	`33`	`'modDN':8,`
`34`	`34`	`}`
`35`		`-CHANGE_TYPES_STR = dict([(v,k) for k,v in CHANGE_TYPES_INT.items()])`
	`35`	`+CHANGE_TYPES_STR = {v: k for k,v in CHANGE_TYPES_INT.items()}`
`36`	`36`
`37`	`37`
`38`	`38`	`class PersistentSearchControl(RequestControl):`