old_contents: """
  Helper functions for loading environment settings.
  """
  from __future__ import print_function
  import os
  import sys
  import json
  from lazy import lazy
  from path import path
  
  
  class Env(object):
      """
      Load information about the execution environment.
      """
  
      # Root of the git repository (edx-platform)
      REPO_ROOT = path(__file__).parent.parent.parent
  
      # Service variant (lms, cms, etc.) configured with an environment variable
      # We use this to determine which envs.json file to load.
      SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
  
      @lazy
      def env_tokens(self):
          """
          Return a dict of environment settings.
          If we couldn't find the JSON file, issue a warning and return an empty dict.
          """
  
          # Find the env JSON file
          if self.SERVICE_VARIANT:
              env_path = self.REPO_ROOT.parent / "{service}.env.json".format(service=self.SERVICE_VARIANT)
          else:
              env_path = path("env.json").abspath()
  
          # If the file does not exist, here or one level up,
          # issue a warning and return an empty dict
          if not env_path.isfile():
              env_path = env_path.parent.parent / env_path.basename()
          if not env_path.isfile():
              print(
                  "Warning: could not find environment JSON file "
                  "at '{path}'".format(path=env_path),
                  file=sys.stderr,
              )
              return dict()
  
          # Otherwise, load the file as JSON and return the resulting dict
          try:
              with open(env_path) as env_file:
                  return json.load(env_file)
  
          except ValueError:
              print(
                  "Error: Could not parse JSON "
                  "in {path}".format(path=env_path),
                  file=sys.stderr,
              )
              sys.exit(1)
  
      @lazy
      def feature_flags(self):
          """
          Return a dictionary of feature flags configured by the environment.
          """
          return self.env_tokens.get('FEATURES', dict())
  
new_contents: """
  Helper functions for loading environment settings.
  """
  from __future__ import print_function
  import os
  import sys
  import json
  from lazy import lazy
  from path import path
  
  
  class Env(object):
      """
      Load information about the execution environment.
      """
  
      # Root of the git repository (edx-platform)
      REPO_ROOT = path(__file__).abspath().parent.parent.parent
  
      # Service variant (lms, cms, etc.) configured with an environment variable
      # We use this to determine which envs.json file to load.
      SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
  
      @lazy
      def env_tokens(self):
          """
          Return a dict of environment settings.
          If we couldn't find the JSON file, issue a warning and return an empty dict.
          """
  
          # Find the env JSON file
          if self.SERVICE_VARIANT:
              env_path = self.REPO_ROOT.parent / "{service}.env.json".format(service=self.SERVICE_VARIANT)
          else:
              env_path = path("env.json").abspath()
  
          # If the file does not exist, here or one level up,
          # issue a warning and return an empty dict
          if not env_path.isfile():
              env_path = env_path.parent.parent / env_path.basename()
          if not env_path.isfile():
              print(
                  "Warning: could not find environment JSON file "
                  "at '{path}'".format(path=env_path),
                  file=sys.stderr,
              )
              return dict()
  
          # Otherwise, load the file as JSON and return the resulting dict
          try:
              with open(env_path) as env_file:
                  return json.load(env_file)
  
          except ValueError:
              print(
                  "Error: Could not parse JSON "
                  "in {path}".format(path=env_path),
                  file=sys.stderr,
              )
              sys.exit(1)
  
      @lazy
      def feature_flags(self):
          """
          Return a dictionary of feature flags configured by the environment.
          """
          return self.env_tokens.get('FEATURES', dict())
  
subject: fix paver theming on devstack (SERVICE_VARIANT support)