1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
source/PYTHON/EXTENSIONS/BALL/file.sip | 2 +-
source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip | 4 ++--
source/PYTHON/EXTENSIONS/VIEW/mainControl.sip | 2 +-
source/PYTHON/pyInterpreter.C | 9 +++++----
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/source/PYTHON/EXTENSIONS/BALL/file.sip b/source/PYTHON/EXTENSIONS/BALL/file.sip
index e29170a..6ec6dc4 100644
--- a/source/PYTHON/EXTENSIONS/BALL/file.sip
+++ b/source/PYTHON/EXTENSIONS/BALL/file.sip
@@ -70,7 +70,7 @@ class File
// std::fstream& getFileStream();
bool copyTo(const String&);
bool moveTo(const String&);
- bool remove() const;
+ bool remove();
bool renameTo(const String&);
bool truncate(int) const;
bool operator == (const File& /file/) const;
diff --git a/source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip b/source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip
index 2b79778..46daade 100644
--- a/source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip
+++ b/source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip
@@ -22,8 +22,8 @@ using namespace BALL;
void disable();
SimpleBox3 getBox() const;
void setBox(const SimpleBox3&);
- int addSolvent(const String&) const;
- int removeSolvent() const;
+ int addSolvent(const String& /In/);
+ int removeSolvent();
bool isEnabled() const;
void updateMolecules();
Options* options;
diff --git a/source/PYTHON/EXTENSIONS/VIEW/mainControl.sip b/source/PYTHON/EXTENSIONS/VIEW/mainControl.sip
index 0a6c319..61d4596 100644
--- a/source/PYTHON/EXTENSIONS/VIEW/mainControl.sip
+++ b/source/PYTHON/EXTENSIONS/VIEW/mainControl.sip
@@ -139,7 +139,7 @@ class MainControl
virtual void openFile(const String&) throw();
void saveBALLViewProjectFile(const String&);
void loadBALLViewProjectFile(const String&) throw();
- void quickSave() const;
+ void quickSave();
void quickLoad();
void processEvents(Size);
};
diff --git a/source/PYTHON/pyInterpreter.C b/source/PYTHON/pyInterpreter.C
index 155a09f..7a12c33 100644
--- a/source/PYTHON/pyInterpreter.C
+++ b/source/PYTHON/pyInterpreter.C
@@ -4,9 +4,9 @@
// $Id: ball-1.4.1-python.patch,v 1.1 2012/03/25 14:13:39 jlec Exp $
//
-#include <Python.h>
-
#include <BALL/PYTHON/pyInterpreter.h>
+#include <Python.h>
+
#include <BALL/PYTHON/BALLPythonConfig.h>
#include <BALL/FORMAT/lineBasedFile.h>
@@ -34,7 +34,6 @@ namespace BALL
PyObject* result = PyRun_String(const_cast<char*>(str.c_str()), mode, context_, context_);
if (PyErr_Occurred())
{
- PyErr_Print();
PyObject* type;
PyObject* value;
PyObject* range;
@@ -50,7 +49,9 @@ namespace BALL
{
error_message_ += " (error message could not be parsed)";
}
-
+
+ PyErr_Print();
+
error_message_ += "\n";
return 0;
|
GitWeb