/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to dracut-module/password-agent.c

  • Committer: Teddy Hogeborn
  • Date: 2020-02-06 15:56:51 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20200206155651-kx7r39zj8hpv8udl
Use collections.abc.Callable instead of collections.Callable

In Python 3.7, collections.Callable (among others) was moved to
collections.abc.Callable, and its old location deprecated.

* mandos: Create "collections.abc.Callable" if it does not exist, and
  only use the new name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dracut-module/password-agent.c
148
148
  mono_microsecs next_run;
149
149
} __attribute__((designated_init)) task_queue;
150
150
 
151
 
/* "func_type" - A function type for task functions
 
151
/* "task_func" - A function type for task functions
152
152
 
153
153
   I.e. functions for the code which runs when a task is run, all have
154
154
   this type */
8092
8092
  g_option_context_set_help_enabled(context, FALSE);
8093
8093
  g_option_context_set_ignore_unknown_options(context, TRUE);
8094
8094
 
8095
 
  gboolean run_tests = FALSE;
 
8095
  gboolean should_run_tests = FALSE;
8096
8096
  GOptionEntry entries[] = {
8097
8097
    { "test", 0, 0, G_OPTION_ARG_NONE,
8098
 
      &run_tests, "Run tests", NULL },
 
8098
      &should_run_tests, "Run tests", NULL },
8099
8099
    { NULL }
8100
8100
  };
8101
8101
  g_option_context_add_main_entries(context, entries, NULL);
8108
8108
  }
8109
8109
 
8110
8110
  g_option_context_free(context);
8111
 
  return run_tests != FALSE;
 
8111
  return should_run_tests != FALSE;
8112
8112
}