Update headers, fix style for some py files

[alexxy/gromacs.git] / src / python / sip / options / Options.sip

diff --git a/src/python/sip/options/Options.sip b/src/python/sip/options/Options.sip
index 58fafa382e6d1f291998b5d85b79d6305aed6149..77da1cdb2490fbec707497b1dc45fd346e480471 100644 (file)
--- a/src/python/sip/options/Options.sip
+++ b/src/python/sip/options/Options.sip
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -35,9 +35,16 @@
 
 %Module gromacs.Options
 
-%Include string.sip
+%DefaultEncoding "UTF-8"
+
+%Import selection/Selection.sip
 
 %Include options.sip
 %Include abstractoption.sip
+%Include ioptionscontainer.sip
 %Include pyoptionsholder.sip
+
+// This has to be here, instead of 'gromacs.Selection', because otherwise we'll get circular dependencies between sip modules
+%Include selectionoption.sip
 %Include basicoptions.sip
+%Include filenameoption.sip