Transfers: fixup flake8 issuers. rucio#570

bbockelm · Feb 8, 2018 · bb07003 · bb07003
1 parent c30e2f7
commit bb07003
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bin/rucio-admin b/bin/rucio-admin
@@ -520,8 +520,10 @@ def add_protocol_rse(args):
     proto.setdefault('extended_attributes', {})
     if args.ext_attr_json:
         proto['extended_attributes'] = args.ext_attr_json
-    if proto['scheme'] == 'srm' and (not args.space_token or not args.web_service_path):
-        print 'Error: space-token and web-service-path must be provided for SRM endpoints.'
+    # Originally, both web-service-path and space-token were required.  However,
+    # many CMS sites don't use space tokens, so we relax this for now.
+    if proto['scheme'] == 'srm' and not args.web_service_path:
+        print 'Error: web-service-path must be provided for SRM endpoints.'
         return FAILURE
     if args.space_token:
         proto['extended_attributes']['space_token'] = args.space_token

diff --git a/lib/rucio/rse/protocols/protocol.py b/lib/rucio/rse/protocols/protocol.py
@@ -28,7 +28,6 @@
 from rucio.rse import rsemanager
 
 if getattr(rsemanager, 'CLIENT_MODE', None):
-    from rucio.client.replicaclient import ReplicaClient
     from rucio.client.rseclient import RSEClient
 
 if getattr(rsemanager, 'SERVER_MODE', None):
@@ -211,7 +210,6 @@ def __lfns2pfns_client(self, lfns):
             :returns: dict with scope:name as keys and PFN as value (in case of errors the Rucio exception si assigned to the key)
         """
         client = RSEClient()
-        pfns = {}
 
         lfns = [lfns] if isinstance(lfns, dict) else lfns
         lfn_query = ["%s:%s" % (lfn['scope'], lfn['name']) for lfn in lfns]