ringing-lib 0.2.0__tar.gz → 0.2.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: ringing-lib
3
- Version: 0.2.0
3
+ Version: 0.2.1
4
4
  Summary: Python wrapper for the Ringing Class Library
5
5
  Home-page: http://github.com/simpleigh/ringing-lib-python
6
6
  Author: Leigh Simpson
@@ -12,18 +12,23 @@ Description: Python Wrapper for the Ringing Class Library
12
12
  .. image:: https://travis-ci.org/ringing-lib/ringing-lib-python.svg?branch=master
13
13
  :alt: Build Status
14
14
  :target: https://travis-ci.org/ringing-lib/ringing-lib-python
15
+
15
16
  .. image:: https://img.shields.io/badge/licence-GPLv3-red.svg?style=flat
16
17
  :alt: Licence
17
18
  :target: http://www.gnu.org/licenses/gpl-3.0-standalone.html
19
+
18
20
  .. image:: https://img.shields.io/github/issues/ringing-lib/ringing-lib-python.svg?style=flat
19
21
  :alt: Issues
20
22
  :target: https://github.com/ringing-lib/ringing-lib-python/issues
23
+
21
24
  .. image:: https://readthedocs.org/projects/ringing-lib-python/badge/?version=latest
22
25
  :alt: Documentation Status
23
26
  :target: https://readthedocs.org/projects/ringing-lib-python/?badge=latest
27
+
24
28
  .. image:: https://img.shields.io/pypi/v/ringing-lib.svg?style=flat
25
29
  :alt: PyPI Version
26
30
  :target: https://pypi.python.org/pypi/ringing-lib/
31
+
27
32
  .. image:: https://img.shields.io/pypi/dm/ringing-lib.svg?style=flat
28
33
  :alt: PyPI Downloads
29
34
  :target: https://pypi.python.org/pypi/ringing-lib/
@@ -4,18 +4,23 @@ Python Wrapper for the Ringing Class Library
4
4
  .. image:: https://travis-ci.org/ringing-lib/ringing-lib-python.svg?branch=master
5
5
  :alt: Build Status
6
6
  :target: https://travis-ci.org/ringing-lib/ringing-lib-python
7
+
7
8
  .. image:: https://img.shields.io/badge/licence-GPLv3-red.svg?style=flat
8
9
  :alt: Licence
9
10
  :target: http://www.gnu.org/licenses/gpl-3.0-standalone.html
11
+
10
12
  .. image:: https://img.shields.io/github/issues/ringing-lib/ringing-lib-python.svg?style=flat
11
13
  :alt: Issues
12
14
  :target: https://github.com/ringing-lib/ringing-lib-python/issues
15
+
13
16
  .. image:: https://readthedocs.org/projects/ringing-lib-python/badge/?version=latest
14
17
  :alt: Documentation Status
15
18
  :target: https://readthedocs.org/projects/ringing-lib-python/?badge=latest
19
+
16
20
  .. image:: https://img.shields.io/pypi/v/ringing-lib.svg?style=flat
17
21
  :alt: PyPI Version
18
22
  :target: https://pypi.python.org/pypi/ringing-lib/
23
+
19
24
  .. image:: https://img.shields.io/pypi/dm/ringing-lib.svg?style=flat
20
25
  :alt: PyPI Downloads
21
26
  :target: https://pypi.python.org/pypi/ringing-lib/
@@ -0,0 +1 @@
1
+ 0.2.1
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: ringing-lib
3
- Version: 0.2.0
3
+ Version: 0.2.1
4
4
  Summary: Python wrapper for the Ringing Class Library
5
5
  Home-page: http://github.com/simpleigh/ringing-lib-python
6
6
  Author: Leigh Simpson
@@ -12,18 +12,23 @@ Description: Python Wrapper for the Ringing Class Library
12
12
  .. image:: https://travis-ci.org/ringing-lib/ringing-lib-python.svg?branch=master
13
13
  :alt: Build Status
14
14
  :target: https://travis-ci.org/ringing-lib/ringing-lib-python
15
+
15
16
  .. image:: https://img.shields.io/badge/licence-GPLv3-red.svg?style=flat
16
17
  :alt: Licence
17
18
  :target: http://www.gnu.org/licenses/gpl-3.0-standalone.html
19
+
18
20
  .. image:: https://img.shields.io/github/issues/ringing-lib/ringing-lib-python.svg?style=flat
19
21
  :alt: Issues
20
22
  :target: https://github.com/ringing-lib/ringing-lib-python/issues
23
+
21
24
  .. image:: https://readthedocs.org/projects/ringing-lib-python/badge/?version=latest
22
25
  :alt: Documentation Status
23
26
  :target: https://readthedocs.org/projects/ringing-lib-python/?badge=latest
27
+
24
28
  .. image:: https://img.shields.io/pypi/v/ringing-lib.svg?style=flat
25
29
  :alt: PyPI Version
26
30
  :target: https://pypi.python.org/pypi/ringing-lib/
31
+
27
32
  .. image:: https://img.shields.io/pypi/dm/ringing-lib.svg?style=flat
28
33
  :alt: PyPI Downloads
29
34
  :target: https://pypi.python.org/pypi/ringing-lib/
@@ -463,15 +463,16 @@ struct __pyx_obj_7ringing_Group {
463
463
  };
464
464
 
465
465
 
466
- /* "src/group.pxi":128
467
- * return self.size
466
+ /* "src/group.pxi":129
467
+ *
468
468
  *
469
469
  * cdef class GroupIterator: # <<<<<<<<<<<<<<
470
470
  *
471
- * cdef group.const_iterator index
471
+ * cdef Group g
472
472
  */
473
473
  struct __pyx_obj_7ringing_GroupIterator {
474
474
  PyObject_HEAD
475
+ struct __pyx_obj_7ringing_Group *g;
475
476
  ringing::group::const_iterator index;
476
477
  ringing::group::const_iterator end;
477
478
  };
@@ -1065,7 +1066,7 @@ static char __pyx_k_Cannot_append_type_to_ringing_Me[] = "Cannot append {type} t
1065
1066
  static char __pyx_k_Cannot_convert_type_to_ringing_C[] = "Cannot convert {type} to ringing.Change";
1066
1067
  static char __pyx_k_Cannot_convert_type_to_ringing_M[] = "Cannot convert {type} to ringing.Method";
1067
1068
  static char __pyx_k_Cannot_convert_type_to_ringing_R[] = "Cannot convert {type} to ringing.Row";
1068
- static char __pyx_k_Cannot_use_symmetry_flags_with_m[] = "Cannot use symmetry flags with methodscontaining an odd number of changes";
1069
+ static char __pyx_k_Cannot_use_symmetry_flags_with_m[] = "Cannot use symmetry flags with methods containing an odd number of changes";
1069
1070
  static char __pyx_k_Length_of_method_must_be_greater[] = "Length of method must be greater than 0";
1070
1071
  static char __pyx_k_Method_contains_an_odd_number_of[] = "Method contains an odd number of changes";
1071
1072
  static char __pyx_k_RowBlock_changes_starting_row_ro[] = "RowBlock({changes}, starting_row={row})";
@@ -7001,7 +7002,7 @@ static Py_ssize_t __pyx_pf_7ringing_5Group_22__len__(struct __pyx_obj_7ringing_G
7001
7002
  * def __len__(self):
7002
7003
  * return self.size # <<<<<<<<<<<<<<
7003
7004
  *
7004
- * cdef class GroupIterator:
7005
+ *
7005
7006
  */
7006
7007
  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_size); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
7007
7008
  __Pyx_GOTREF(__pyx_t_1);
@@ -7028,12 +7029,12 @@ static Py_ssize_t __pyx_pf_7ringing_5Group_22__len__(struct __pyx_obj_7ringing_G
7028
7029
  return __pyx_r;
7029
7030
  }
7030
7031
 
7031
- /* "src/group.pxi":134
7032
+ /* "src/group.pxi":137
7032
7033
  * cdef group.const_iterator end
7033
7034
  *
7034
7035
  * def __cinit__(self, Group g not None): # <<<<<<<<<<<<<<
7036
+ * self.g = g
7035
7037
  * self.index = deref(g.thisptr).begin()
7036
- * self.end = deref(g.thisptr).end()
7037
7038
  */
7038
7039
 
7039
7040
  /* Python wrapper */
@@ -7064,7 +7065,7 @@ static int __pyx_pw_7ringing_13GroupIterator_1__cinit__(PyObject *__pyx_v_self,
7064
7065
  else goto __pyx_L5_argtuple_error;
7065
7066
  }
7066
7067
  if (unlikely(kw_args > 0)) {
7067
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "__cinit__") < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
7068
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "__cinit__") < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
7068
7069
  }
7069
7070
  } else if (PyTuple_GET_SIZE(__pyx_args) != 1) {
7070
7071
  goto __pyx_L5_argtuple_error;
@@ -7075,13 +7076,13 @@ static int __pyx_pw_7ringing_13GroupIterator_1__cinit__(PyObject *__pyx_v_self,
7075
7076
  }
7076
7077
  goto __pyx_L4_argument_unpacking_done;
7077
7078
  __pyx_L5_argtuple_error:;
7078
- __Pyx_RaiseArgtupleInvalid("__cinit__", 1, 1, 1, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
7079
+ __Pyx_RaiseArgtupleInvalid("__cinit__", 1, 1, 1, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
7079
7080
  __pyx_L3_error:;
7080
7081
  __Pyx_AddTraceback("ringing.GroupIterator.__cinit__", __pyx_clineno, __pyx_lineno, __pyx_filename);
7081
7082
  __Pyx_RefNannyFinishContext();
7082
7083
  return -1;
7083
7084
  __pyx_L4_argument_unpacking_done:;
7084
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_g), __pyx_ptype_7ringing_Group, 0, "g", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
7085
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_g), __pyx_ptype_7ringing_Group, 0, "g", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
7085
7086
  __pyx_r = __pyx_pf_7ringing_13GroupIterator___cinit__(((struct __pyx_obj_7ringing_GroupIterator *)__pyx_v_self), __pyx_v_g);
7086
7087
 
7087
7088
  /* function exit code */
@@ -7098,17 +7099,30 @@ static int __pyx_pf_7ringing_13GroupIterator___cinit__(struct __pyx_obj_7ringing
7098
7099
  __Pyx_RefNannyDeclarations
7099
7100
  __Pyx_RefNannySetupContext("__cinit__", 0);
7100
7101
 
7101
- /* "src/group.pxi":135
7102
+ /* "src/group.pxi":138
7102
7103
  *
7103
7104
  * def __cinit__(self, Group g not None):
7105
+ * self.g = g # <<<<<<<<<<<<<<
7106
+ * self.index = deref(g.thisptr).begin()
7107
+ * self.end = deref(g.thisptr).end()
7108
+ */
7109
+ __Pyx_INCREF(((PyObject *)__pyx_v_g));
7110
+ __Pyx_GIVEREF(((PyObject *)__pyx_v_g));
7111
+ __Pyx_GOTREF(__pyx_v_self->g);
7112
+ __Pyx_DECREF(((PyObject *)__pyx_v_self->g));
7113
+ __pyx_v_self->g = __pyx_v_g;
7114
+
7115
+ /* "src/group.pxi":139
7116
+ * def __cinit__(self, Group g not None):
7117
+ * self.g = g
7104
7118
  * self.index = deref(g.thisptr).begin() # <<<<<<<<<<<<<<
7105
7119
  * self.end = deref(g.thisptr).end()
7106
7120
  *
7107
7121
  */
7108
7122
  __pyx_v_self->index = (*__pyx_v_g->thisptr).begin();
7109
7123
 
7110
- /* "src/group.pxi":136
7111
- * def __cinit__(self, Group g not None):
7124
+ /* "src/group.pxi":140
7125
+ * self.g = g
7112
7126
  * self.index = deref(g.thisptr).begin()
7113
7127
  * self.end = deref(g.thisptr).end() # <<<<<<<<<<<<<<
7114
7128
  *
@@ -7116,12 +7130,12 @@ static int __pyx_pf_7ringing_13GroupIterator___cinit__(struct __pyx_obj_7ringing
7116
7130
  */
7117
7131
  __pyx_v_self->end = (*__pyx_v_g->thisptr).end();
7118
7132
 
7119
- /* "src/group.pxi":134
7133
+ /* "src/group.pxi":137
7120
7134
  * cdef group.const_iterator end
7121
7135
  *
7122
7136
  * def __cinit__(self, Group g not None): # <<<<<<<<<<<<<<
7137
+ * self.g = g
7123
7138
  * self.index = deref(g.thisptr).begin()
7124
- * self.end = deref(g.thisptr).end()
7125
7139
  */
7126
7140
 
7127
7141
  /* function exit code */
@@ -7130,7 +7144,7 @@ static int __pyx_pf_7ringing_13GroupIterator___cinit__(struct __pyx_obj_7ringing
7130
7144
  return __pyx_r;
7131
7145
  }
7132
7146
 
7133
- /* "src/group.pxi":138
7147
+ /* "src/group.pxi":142
7134
7148
  * self.end = deref(g.thisptr).end()
7135
7149
  *
7136
7150
  * def __iter__(self): # <<<<<<<<<<<<<<
@@ -7156,7 +7170,7 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_2__iter__(struct __pyx_obj_7r
7156
7170
  __Pyx_RefNannyDeclarations
7157
7171
  __Pyx_RefNannySetupContext("__iter__", 0);
7158
7172
 
7159
- /* "src/group.pxi":139
7173
+ /* "src/group.pxi":143
7160
7174
  *
7161
7175
  * def __iter__(self):
7162
7176
  * return self # <<<<<<<<<<<<<<
@@ -7168,7 +7182,7 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_2__iter__(struct __pyx_obj_7r
7168
7182
  __pyx_r = ((PyObject *)__pyx_v_self);
7169
7183
  goto __pyx_L0;
7170
7184
 
7171
- /* "src/group.pxi":138
7185
+ /* "src/group.pxi":142
7172
7186
  * self.end = deref(g.thisptr).end()
7173
7187
  *
7174
7188
  * def __iter__(self): # <<<<<<<<<<<<<<
@@ -7183,7 +7197,7 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_2__iter__(struct __pyx_obj_7r
7183
7197
  return __pyx_r;
7184
7198
  }
7185
7199
 
7186
- /* "src/group.pxi":141
7200
+ /* "src/group.pxi":145
7187
7201
  * return self
7188
7202
  *
7189
7203
  * def __next__(self): # <<<<<<<<<<<<<<
@@ -7215,19 +7229,19 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_4__next__(struct __pyx_obj_7r
7215
7229
  int __pyx_clineno = 0;
7216
7230
  __Pyx_RefNannySetupContext("__next__", 0);
7217
7231
 
7218
- /* "src/group.pxi":142
7232
+ /* "src/group.pxi":146
7219
7233
  *
7220
7234
  * def __next__(self):
7221
7235
  * cdef Row result = Row() # <<<<<<<<<<<<<<
7222
7236
  *
7223
7237
  * if self.index == self.end:
7224
7238
  */
7225
- __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_7ringing_Row)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
7239
+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_7ringing_Row)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
7226
7240
  __Pyx_GOTREF(__pyx_t_1);
7227
7241
  __pyx_v_result = ((struct __pyx_obj_7ringing_Row *)__pyx_t_1);
7228
7242
  __pyx_t_1 = 0;
7229
7243
 
7230
- /* "src/group.pxi":144
7244
+ /* "src/group.pxi":148
7231
7245
  * cdef Row result = Row()
7232
7246
  *
7233
7247
  * if self.index == self.end: # <<<<<<<<<<<<<<
@@ -7237,7 +7251,7 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_4__next__(struct __pyx_obj_7r
7237
7251
  __pyx_t_2 = ((__pyx_v_self->index == __pyx_v_self->end) != 0);
7238
7252
  if (__pyx_t_2) {
7239
7253
 
7240
- /* "src/group.pxi":145
7254
+ /* "src/group.pxi":149
7241
7255
  *
7242
7256
  * if self.index == self.end:
7243
7257
  * raise StopIteration # <<<<<<<<<<<<<<
@@ -7245,10 +7259,10 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_4__next__(struct __pyx_obj_7r
7245
7259
  * result.thisptr[0] = deref(self.index)
7246
7260
  */
7247
7261
  __Pyx_Raise(__pyx_builtin_StopIteration, 0, 0, 0);
7248
- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
7262
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
7249
7263
  }
7250
7264
 
7251
- /* "src/group.pxi":147
7265
+ /* "src/group.pxi":151
7252
7266
  * raise StopIteration
7253
7267
  *
7254
7268
  * result.thisptr[0] = deref(self.index) # <<<<<<<<<<<<<<
@@ -7257,7 +7271,7 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_4__next__(struct __pyx_obj_7r
7257
7271
  */
7258
7272
  (__pyx_v_result->thisptr[0]) = (*__pyx_v_self->index);
7259
7273
 
7260
- /* "src/group.pxi":148
7274
+ /* "src/group.pxi":152
7261
7275
  *
7262
7276
  * result.thisptr[0] = deref(self.index)
7263
7277
  * self.index += 1 # <<<<<<<<<<<<<<
@@ -7265,7 +7279,7 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_4__next__(struct __pyx_obj_7r
7265
7279
  */
7266
7280
  __pyx_v_self->index += 1;
7267
7281
 
7268
- /* "src/group.pxi":149
7282
+ /* "src/group.pxi":153
7269
7283
  * result.thisptr[0] = deref(self.index)
7270
7284
  * self.index += 1
7271
7285
  * return result # <<<<<<<<<<<<<<
@@ -7275,7 +7289,7 @@ static PyObject *__pyx_pf_7ringing_13GroupIterator_4__next__(struct __pyx_obj_7r
7275
7289
  __pyx_r = ((PyObject *)__pyx_v_result);
7276
7290
  goto __pyx_L0;
7277
7291
 
7278
- /* "src/group.pxi":141
7292
+ /* "src/group.pxi":145
7279
7293
  * return self
7280
7294
  *
7281
7295
  * def __next__(self): # <<<<<<<<<<<<<<
@@ -11144,6 +11158,7 @@ static int __pyx_pf_7ringing_6Method___cinit__(struct __pyx_obj_7ringing_Method
11144
11158
  PyObject *__pyx_t_5 = NULL;
11145
11159
  std::string __pyx_t_6;
11146
11160
  int __pyx_t_7;
11161
+ ringing::method *__pyx_t_8;
11147
11162
  int __pyx_lineno = 0;
11148
11163
  const char *__pyx_filename = NULL;
11149
11164
  int __pyx_clineno = 0;
@@ -11447,7 +11462,21 @@ static int __pyx_pf_7ringing_6Method___cinit__(struct __pyx_obj_7ringing_Method
11447
11462
  * elif isinstance(input, bytes):
11448
11463
  * self.thisptr = new method(<string>input, bells, name_string)
11449
11464
  */
11450
- __pyx_v_self->thisptr = new ringing::method(((std::string)__pyx_t_6), __pyx_v_bells, __pyx_v_name_string);
11465
+ try {
11466
+ __pyx_t_8 = new ringing::method(((std::string)__pyx_t_6), __pyx_v_bells, __pyx_v_name_string);
11467
+ } catch(...) {
11468
+ __Pyx_CppExn2PyErr();
11469
+ {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
11470
+ }
11471
+
11472
+ /* "src/method.pxi":33
11473
+ * raise ValueError('Length of method must be greater than 0')
11474
+ * elif isinstance(input, unicode):
11475
+ * self.thisptr = new method(<string>(input.encode()), bells, # <<<<<<<<<<<<<<
11476
+ * name_string)
11477
+ * elif isinstance(input, bytes):
11478
+ */
11479
+ __pyx_v_self->thisptr = __pyx_t_8;
11451
11480
  goto __pyx_L5;
11452
11481
  }
11453
11482
 
@@ -11470,7 +11499,13 @@ static int __pyx_pf_7ringing_6Method___cinit__(struct __pyx_obj_7ringing_Method
11470
11499
  * raise TypeError('Cannot convert {type} to ringing.Method'.format(
11471
11500
  */
11472
11501
  __pyx_t_6 = __pyx_convert_string_from_py_std__string(__pyx_v_input); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
11473
- __pyx_v_self->thisptr = new ringing::method(((std::string)__pyx_t_6), __pyx_v_bells, __pyx_v_name_string);
11502
+ try {
11503
+ __pyx_t_8 = new ringing::method(((std::string)__pyx_t_6), __pyx_v_bells, __pyx_v_name_string);
11504
+ } catch(...) {
11505
+ __Pyx_CppExn2PyErr();
11506
+ {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
11507
+ }
11508
+ __pyx_v_self->thisptr = __pyx_t_8;
11474
11509
  goto __pyx_L5;
11475
11510
  }
11476
11511
  /*else*/ {
@@ -14016,7 +14051,7 @@ static PyObject *__pyx_pf_7ringing_6Method_34format(struct __pyx_obj_7ringing_Me
14016
14051
  * format |= value
14017
14052
  *
14018
14053
  * if self.size % 2 and format & 0o40: # <<<<<<<<<<<<<<
14019
- * raise ValueError('Cannot use symmetry flags with methods'
14054
+ * raise ValueError('Cannot use symmetry flags with methods '
14020
14055
  * 'containing an odd number of changes')
14021
14056
  */
14022
14057
  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_size); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -14039,7 +14074,7 @@ static PyObject *__pyx_pf_7ringing_6Method_34format(struct __pyx_obj_7ringing_Me
14039
14074
  /* "src/method.pxi":192
14040
14075
  *
14041
14076
  * if self.size % 2 and format & 0o40:
14042
- * raise ValueError('Cannot use symmetry flags with methods' # <<<<<<<<<<<<<<
14077
+ * raise ValueError('Cannot use symmetry flags with methods ' # <<<<<<<<<<<<<<
14043
14078
  * 'containing an odd number of changes')
14044
14079
  *
14045
14080
  */
@@ -16065,6 +16100,7 @@ static PyObject *__pyx_tp_new_7ringing_GroupIterator(PyTypeObject *t, PyObject *
16065
16100
  p = ((struct __pyx_obj_7ringing_GroupIterator *)o);
16066
16101
  new((void*)&(p->index)) ringing::group::const_iterator();
16067
16102
  new((void*)&(p->end)) ringing::group::const_iterator();
16103
+ p->g = ((struct __pyx_obj_7ringing_Group *)Py_None); Py_INCREF(Py_None);
16068
16104
  if (unlikely(__pyx_pw_7ringing_13GroupIterator_1__cinit__(o, a, k) < 0)) {
16069
16105
  Py_DECREF(o); o = 0;
16070
16106
  }
@@ -16074,15 +16110,35 @@ static PyObject *__pyx_tp_new_7ringing_GroupIterator(PyTypeObject *t, PyObject *
16074
16110
  static void __pyx_tp_dealloc_7ringing_GroupIterator(PyObject *o) {
16075
16111
  struct __pyx_obj_7ringing_GroupIterator *p = (struct __pyx_obj_7ringing_GroupIterator *)o;
16076
16112
  #if PY_VERSION_HEX >= 0x030400a1
16077
- if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
16113
+ if (unlikely(Py_TYPE(o)->tp_finalize) && !_PyGC_FINALIZED(o)) {
16078
16114
  if (PyObject_CallFinalizerFromDealloc(o)) return;
16079
16115
  }
16080
16116
  #endif
16117
+ PyObject_GC_UnTrack(o);
16081
16118
  __Pyx_call_destructor(&p->index);
16082
16119
  __Pyx_call_destructor(&p->end);
16120
+ Py_CLEAR(p->g);
16083
16121
  (*Py_TYPE(o)->tp_free)(o);
16084
16122
  }
16085
16123
 
16124
+ static int __pyx_tp_traverse_7ringing_GroupIterator(PyObject *o, visitproc v, void *a) {
16125
+ int e;
16126
+ struct __pyx_obj_7ringing_GroupIterator *p = (struct __pyx_obj_7ringing_GroupIterator *)o;
16127
+ if (p->g) {
16128
+ e = (*v)(((PyObject*)p->g), a); if (e) return e;
16129
+ }
16130
+ return 0;
16131
+ }
16132
+
16133
+ static int __pyx_tp_clear_7ringing_GroupIterator(PyObject *o) {
16134
+ PyObject* tmp;
16135
+ struct __pyx_obj_7ringing_GroupIterator *p = (struct __pyx_obj_7ringing_GroupIterator *)o;
16136
+ tmp = ((PyObject*)p->g);
16137
+ p->g = ((struct __pyx_obj_7ringing_Group *)Py_None); Py_INCREF(Py_None);
16138
+ Py_XDECREF(tmp);
16139
+ return 0;
16140
+ }
16141
+
16086
16142
  static PyMethodDef __pyx_methods_7ringing_GroupIterator[] = {
16087
16143
  {"__next__", (PyCFunction)__pyx_pw_7ringing_13GroupIterator_5__next__, METH_NOARGS|METH_COEXIST, 0},
16088
16144
  {0, 0, 0, 0}
@@ -16112,10 +16168,10 @@ static PyTypeObject __pyx_type_7ringing_GroupIterator = {
16112
16168
  0, /*tp_getattro*/
16113
16169
  0, /*tp_setattro*/
16114
16170
  0, /*tp_as_buffer*/
16115
- Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
16171
+ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
16116
16172
  0, /*tp_doc*/
16117
- 0, /*tp_traverse*/
16118
- 0, /*tp_clear*/
16173
+ __pyx_tp_traverse_7ringing_GroupIterator, /*tp_traverse*/
16174
+ __pyx_tp_clear_7ringing_GroupIterator, /*tp_clear*/
16119
16175
  0, /*tp_richcompare*/
16120
16176
  0, /*tp_weaklistoffset*/
16121
16177
  __pyx_pw_7ringing_13GroupIterator_3__iter__, /*tp_iter*/
@@ -16815,7 +16871,7 @@ static int __Pyx_InitCachedBuiltins(void) {
16815
16871
  __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
16816
16872
  __pyx_builtin_NotImplemented = __Pyx_GetBuiltinName(__pyx_n_s_NotImplemented); if (!__pyx_builtin_NotImplemented) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
16817
16873
  __pyx_builtin_IndexError = __Pyx_GetBuiltinName(__pyx_n_s_IndexError); if (!__pyx_builtin_IndexError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
16818
- __pyx_builtin_StopIteration = __Pyx_GetBuiltinName(__pyx_n_s_StopIteration); if (!__pyx_builtin_StopIteration) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
16874
+ __pyx_builtin_StopIteration = __Pyx_GetBuiltinName(__pyx_n_s_StopIteration); if (!__pyx_builtin_StopIteration) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
16819
16875
  __pyx_builtin_input = __Pyx_GetBuiltinName(__pyx_n_s_input); if (!__pyx_builtin_input) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
16820
16876
  return 0;
16821
16877
  __pyx_L1_error:;
@@ -17098,7 +17154,7 @@ static int __Pyx_InitCachedConstants(void) {
17098
17154
  /* "src/method.pxi":192
17099
17155
  *
17100
17156
  * if self.size % 2 and format & 0o40:
17101
- * raise ValueError('Cannot use symmetry flags with methods' # <<<<<<<<<<<<<<
17157
+ * raise ValueError('Cannot use symmetry flags with methods ' # <<<<<<<<<<<<<<
17102
17158
  * 'containing an odd number of changes')
17103
17159
  *
17104
17160
  */
@@ -17382,9 +17438,9 @@ PyMODINIT_FUNC PyInit_ringing(void)
17382
17438
  __pyx_type_7ringing_Group.tp_print = 0;
17383
17439
  if (PyObject_SetAttrString(__pyx_m, "Group", (PyObject *)&__pyx_type_7ringing_Group) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
17384
17440
  __pyx_ptype_7ringing_Group = &__pyx_type_7ringing_Group;
17385
- if (PyType_Ready(&__pyx_type_7ringing_GroupIterator) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
17441
+ if (PyType_Ready(&__pyx_type_7ringing_GroupIterator) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 129; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
17386
17442
  __pyx_type_7ringing_GroupIterator.tp_print = 0;
17387
- if (PyObject_SetAttrString(__pyx_m, "GroupIterator", (PyObject *)&__pyx_type_7ringing_GroupIterator) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
17443
+ if (PyObject_SetAttrString(__pyx_m, "GroupIterator", (PyObject *)&__pyx_type_7ringing_GroupIterator) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 129; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
17388
17444
  __pyx_ptype_7ringing_GroupIterator = &__pyx_type_7ringing_GroupIterator;
17389
17445
  if (PyType_Ready(&__pyx_type_7ringing_Change) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
17390
17446
  __pyx_type_7ringing_Change.tp_print = 0;
ringing-lib-0.2.0/VERSION DELETED
@@ -1 +0,0 @@
1
- 0.2.0
File without changes
@@ -1,5 +1,5 @@
1
1
  [egg_info]
2
- tag_build =
3
- tag_date = 0
4
2
  tag_svn_revision = 0
3
+ tag_date = 0
4
+ tag_build =
5
5
 
File without changes