geany-zencoding/geany-zencoding.patch

   1 diff -rcB geany-zc-orig/configure.ac geany-zencoding/configure.ac
   2 *** geany-zc-orig/configure.ac  2011-11-14 20:59:28.746554254 +0545
   3 --- geany-zencoding/configure.ac        2011-11-14 20:56:50.613230459 +0545
   4 ***************
   5 *** 15,21 ****
   6   AC_PROG_SED
   7
   8   # Check for Python to pre-compile python sources
   9 ! AC_PATH_PROG([PYTHON], [python], [no])
  10   AC_SUBST([PYTHON])
  11   if [[ x"$PYTHON" = "xno" ]]; then
  12         AC_MSG_ERROR([Python not found, is it installed?])
  13 --- 15,21 ----
  14   AC_PROG_SED
  15
  16   # Check for Python to pre-compile python sources
  17 ! AC_PATH_PROG([PYTHON], [python2], [no])
  18   AC_SUBST([PYTHON])
  19   if [[ x"$PYTHON" = "xno" ]]; then
  20         AC_MSG_ERROR([Python not found, is it installed?])
  21 diff -rcB geany-zc-orig/zencoding/actions/basic.py geany-zencoding/zencoding/actions/basic.py
  22 *** geany-zc-orig/zencoding/actions/basic.py    2011-11-14 20:59:28.749887587 +0545
  23 --- geany-zencoding/zencoding/actions/basic.py  2011-11-14 20:58:38.286557305 +0545
  24 ***************
  25 *** 1,4 ****
  26 ! #!/usr/bin/env python
  27   # -*- coding: utf-8 -*-
  28
  29   """
  30 --- 1,4 ----
  31 ! #!/usr/bin/env python2
  32   # -*- coding: utf-8 -*-
  33
  34   """
  35 diff -rcB geany-zc-orig/zencoding/actions/__init__.py geany-zencoding/zencoding/actions/__init__.py
  36 *** geany-zc-orig/zencoding/actions/__init__.py 2011-11-14 20:59:28.746554254 +0545
  37 --- geany-zencoding/zencoding/actions/__init__.py       2011-11-14 20:58:38.166557314 +0545
  38 ***************
  39 *** 1,4 ****
  40 ! #!/usr/bin/env python
  41   # -*- coding: utf-8 -*-
  42
  43   # import all actions
  44 --- 1,4 ----
  45 ! #!/usr/bin/env python2
  46   # -*- coding: utf-8 -*-
  47
  48   # import all actions
  49 ***************
  50 *** 12,15 ****
  51
  52   __import__(__name__, globals(), locals(), __sub_modules)
  53
  54 ! del __sub_modules
  55 \ No newline at end of file
  56 --- 12,15 ----
  57
  58   __import__(__name__, globals(), locals(), __sub_modules)
  59
  60 ! del __sub_modules
  61 diff -rcB geany-zc-orig/zencoding/actions/token.py geany-zencoding/zencoding/actions/token.py
  62 *** geany-zc-orig/zencoding/actions/token.py    2011-11-14 20:59:28.749887587 +0545
  63 --- geany-zencoding/zencoding/actions/token.py  2011-11-14 20:58:38.039890653 +0545
  64 ***************
  65 *** 1,4 ****
  66 ! #!/usr/bin/env python
  67   # -*- coding: utf-8 -*-
  68
  69   '''
  70 --- 1,4 ----
  71 ! #!/usr/bin/env python2
  72   # -*- coding: utf-8 -*-
  73
  74   '''
  75 diff -rcB geany-zc-orig/zencoding/filters/comment.py geany-zencoding/zencoding/filters/comment.py
  76 *** geany-zc-orig/zencoding/filters/comment.py  2011-11-14 20:59:28.749887587 +0545
  77 --- geany-zencoding/zencoding/filters/comment.py        2011-11-14 20:58:38.999890624 +0545
  78 ***************
  79 *** 1,4 ****
  80 ! #!/usr/bin/env python
  81   # -*- coding: utf-8 -*-
  82
  83   '''
  84 --- 1,4 ----
  85 ! #!/usr/bin/env python2
  86   # -*- coding: utf-8 -*-
  87
  88   '''
  89 ***************
  90 *** 44,47 ****
  91                         add_comments(item, i)
  92                 process(item, profile)
  93
  94 !       return tree
  95 \ No newline at end of file
  96 --- 44,47 ----
  97                         add_comments(item, i)
  98                 process(item, profile)
  99
 100 !       return tree
 101 diff -rcB geany-zc-orig/zencoding/filters/css.py geany-zencoding/zencoding/filters/css.py
 102 *** geany-zc-orig/zencoding/filters/css.py      2011-11-14 20:59:28.749887587 +0545
 103 --- geany-zencoding/zencoding/filters/css.py    2011-11-14 20:58:38.886557271 +0545
 104 ***************
 105 *** 1,4 ****
 106 ! #!/usr/bin/env python
 107   # -*- coding: utf-8 -*-
 108   '''
 109   Process CSS properties: replaces snippets, augumented with ! char, with
 110 --- 1,4 ----
 111 ! #!/usr/bin/env python2
 112   # -*- coding: utf-8 -*-
 113   '''
 114   Process CSS properties: replaces snippets, augumented with ! char, with
 115 ***************
 116 *** 20,23 ****
 117
 118                 process(item, profile)
 119
 120 !       return tree
 121 \ No newline at end of file
 122 --- 20,23 ----
 123
 124                 process(item, profile)
 125
 126 !       return tree
 127 diff -rcB geany-zc-orig/zencoding/filters/escape.py geany-zencoding/zencoding/filters/escape.py
 128 *** geany-zc-orig/zencoding/filters/escape.py   2011-11-14 20:59:28.749887587 +0545
 129 --- geany-zencoding/zencoding/filters/escape.py 2011-11-14 20:58:38.586557288 +0545
 130 ***************
 131 *** 1,4 ****
 132 ! #!/usr/bin/env python
 133   # -*- coding: utf-8 -*-
 134
 135   '''
 136 --- 1,4 ----
 137 ! #!/usr/bin/env python2
 138   # -*- coding: utf-8 -*-
 139
 140   '''
 141 ***************
 142 *** 28,31 ****
 143
 144                 process(item)
 145
 146 !       return tree
 147 \ No newline at end of file
 148 --- 28,31 ----
 149
 150                 process(item)
 151
 152 !       return tree
 153 diff -rcB geany-zc-orig/zencoding/filters/format-css.py geany-zencoding/zencoding/filters/format-css.py
 154 *** geany-zc-orig/zencoding/filters/format-css.py       2011-11-14 20:59:28.749887587 +0545
 155 --- geany-zencoding/zencoding/filters/format-css.py     2011-11-14 20:58:39.126557254 +0545
 156 ***************
 157 *** 1,4 ****
 158 ! #!/usr/bin/env python
 159   # -*- coding: utf-8 -*-
 160
 161   '''
 162 --- 1,4 ----
 163 ! #!/usr/bin/env python2
 164   # -*- coding: utf-8 -*-
 165
 166   '''
 167 ***************
 168 *** 21,24 ****
 169
 170                 process(item, profile)
 171
 172 !       return tree
 173 \ No newline at end of file
 174 --- 21,24 ----
 175
 176                 process(item, profile)
 177
 178 !       return tree
 179 diff -rcB geany-zc-orig/zencoding/filters/format.py geany-zencoding/zencoding/filters/format.py
 180 *** geany-zc-orig/zencoding/filters/format.py   2011-11-14 20:59:28.749887587 +0545
 181 --- geany-zencoding/zencoding/filters/format.py 2011-11-14 20:58:39.489890569 +0545
 182 ***************
 183 *** 1,4 ****
 184 ! #!/usr/bin/env python
 185   # -*- coding: utf-8 -*-
 186
 187   """
 188 --- 1,4 ----
 189 ! #!/usr/bin/env python2
 190   # -*- coding: utf-8 -*-
 191
 192   """
 193 ***************
 194 *** 179,182 ****
 195
 196                 process(item, profile, level + 1)
 197
 198 !       return tree
 199 \ No newline at end of file
 200 --- 179,182 ----
 201
 202                 process(item, profile, level + 1)
 203
 204 !       return tree
 205 diff -rcB geany-zc-orig/zencoding/filters/haml.py geany-zencoding/zencoding/filters/haml.py
 206 *** geany-zc-orig/zencoding/filters/haml.py     2011-11-14 20:59:28.749887587 +0545
 207 --- geany-zencoding/zencoding/filters/haml.py   2011-11-14 20:58:39.376557242 +0545
 208 ***************
 209 *** 1,4 ****
 210 ! #!/usr/bin/env python
 211   # -*- coding: utf-8 -*-
 212
 213   '''
 214 --- 1,4 ----
 215 ! #!/usr/bin/env python2
 216   # -*- coding: utf-8 -*-
 217
 218   '''
 219 ***************
 220 *** 157,160 ****
 221
 222                 process(item, profile, level + 1)
 223
 224 !       return tree
 225 \ No newline at end of file
 226 --- 157,160 ----
 227
 228                 process(item, profile, level + 1)
 229
 230 !       return tree
 231 diff -rcB geany-zc-orig/zencoding/filters/html.py geany-zencoding/zencoding/filters/html.py
 232 *** geany-zc-orig/zencoding/filters/html.py     2011-11-14 20:59:28.749887587 +0545
 233 --- geany-zencoding/zencoding/filters/html.py   2011-11-14 20:58:38.389890632 +0545
 234 ***************
 235 *** 1,4 ****
 236 ! #!/usr/bin/env python
 237   # -*- coding: utf-8 -*-
 238
 239   '''
 240 --- 1,4 ----
 241 ! #!/usr/bin/env python2
 242   # -*- coding: utf-8 -*-
 243
 244   '''
 245 diff -rcB geany-zc-orig/zencoding/filters/__init__.py geany-zencoding/zencoding/filters/__init__.py
 246 *** geany-zc-orig/zencoding/filters/__init__.py 2011-11-14 20:59:28.749887587 +0545
 247 --- geany-zencoding/zencoding/filters/__init__.py       2011-11-14 20:58:38.683223948 +0545
 248 ***************
 249 *** 1,4 ****
 250 ! #!/usr/bin/env python
 251   # -*- coding: utf-8 -*-
 252
 253   import os.path
 254 --- 1,4 ----
 255 ! #!/usr/bin/env python2
 256   # -*- coding: utf-8 -*-
 257
 258   import os.path
 259 ***************
 260 *** 14,17 ****
 261
 262   __import__(__name__, globals(), locals(), __sub_modules)
 263
 264 ! del __sub_modules
 265 \ No newline at end of file
 266 --- 14,17 ----
 267
 268   __import__(__name__, globals(), locals(), __sub_modules)
 269
 270 ! del __sub_modules
 271 diff -rcB geany-zc-orig/zencoding/filters/single-line.py geany-zencoding/zencoding/filters/single-line.py
 272 *** geany-zc-orig/zencoding/filters/single-line.py      2011-11-14 20:59:28.749887587 +0545
 273 --- geany-zencoding/zencoding/filters/single-line.py    2011-11-14 20:58:38.786557275 +0545
 274 ***************
 275 *** 1,4 ****
 276 ! #!/usr/bin/env python
 277   # -*- coding: utf-8 -*-
 278   '''
 279   Output abbreviation on a single line (i.e. no line breaks)
 280 --- 1,4 ----
 281 ! #!/usr/bin/env python2
 282   # -*- coding: utf-8 -*-
 283   '''
 284   Output abbreviation on a single line (i.e. no line breaks)
 285 ***************
 286 *** 26,29 ****
 287
 288                 process(item, profile)
 289
 290 !       return tree
 291 \ No newline at end of file
 292 --- 26,29 ----
 293
 294                 process(item, profile)
 295
 296 !       return tree
 297 diff -rcB geany-zc-orig/zencoding/filters/trim.py geany-zencoding/zencoding/filters/trim.py
 298 *** geany-zc-orig/zencoding/filters/trim.py     2011-11-14 20:59:28.749887587 +0545
 299 --- geany-zencoding/zencoding/filters/trim.py   2011-11-14 20:58:39.249890589 +0545
 300 ***************
 301 *** 1,4 ****
 302 ! #!/usr/bin/env python
 303   # -*- coding: utf-8 -*-
 304   '''
 305   Trim filter: removes characters at the beginning of the text
 306 --- 1,4 ----
 307 ! #!/usr/bin/env python2
 308   # -*- coding: utf-8 -*-
 309   '''
 310   Trim filter: removes characters at the beginning of the text
 311 ***************
 312 *** 19,22 ****
 313
 314                 process(item, profile)
 315
 316 !       return tree
 317 \ No newline at end of file
 318 --- 19,22 ----
 319
 320                 process(item, profile)
 321
 322 !       return tree
 323 diff -rcB geany-zc-orig/zencoding/filters/xsl.py geany-zencoding/zencoding/filters/xsl.py
 324 *** geany-zc-orig/zencoding/filters/xsl.py      2011-11-14 20:59:28.749887587 +0545
 325 --- geany-zencoding/zencoding/filters/xsl.py    2011-11-14 20:58:38.489890626 +0545
 326 ***************
 327 *** 1,4 ****
 328 ! #!/usr/bin/env python
 329   # -*- coding: utf-8 -*-
 330
 331   '''
 332 --- 1,4 ----
 333 ! #!/usr/bin/env python2
 334   # -*- coding: utf-8 -*-
 335
 336   '''
 337 ***************
 338 *** 30,33 ****
 339                 if item.type == 'tag' and item.name.lower() in tags and item.children:
 340                         trim_attribute(item)
 341
 342 !               process(item, profile)
 343 \ No newline at end of file
 344 --- 30,33 ----
 345                 if item.type == 'tag' and item.name.lower() in tags and item.children:
 346                         trim_attribute(item)
 347
 348 !               process(item, profile)
 349 diff -rcB geany-zc-orig/zencoding/html_matcher.py geany-zencoding/zencoding/html_matcher.py
 350 *** geany-zc-orig/zencoding/html_matcher.py     2011-11-14 20:59:28.749887587 +0545
 351 --- geany-zencoding/zencoding/html_matcher.py   2011-11-14 20:58:37.916557326 +0545
 352 ***************
 353 *** 1,4 ****
 354 ! #!/usr/bin/env python
 355   # -*- coding: utf-8 -*-
 356
 357   '''
 358 --- 1,4 ----
 359 ! #!/usr/bin/env python2
 360   # -*- coding: utf-8 -*-
 361
 362   '''
 363 ***************
 364 *** 270,273 ****
 365
 366                         ix += 1
 367
 368 !       return action(opening_tag, closing_tag, start_ix)
 369 \ No newline at end of file
 370 --- 270,273 ----
 371
 372                         ix += 1
 373
 374 !       return action(opening_tag, closing_tag, start_ix)
 375 diff -rcB geany-zc-orig/zencoding/resources.py geany-zencoding/zencoding/resources.py
 376 *** geany-zc-orig/zencoding/resources.py        2011-11-14 20:59:28.753220920 +0545
 377 --- geany-zencoding/zencoding/resources.py      2011-11-14 20:58:39.589890567 +0545
 378 ***************
 379 *** 1,4 ****
 380 ! #!/usr/bin/env python
 381   # -*- coding: utf-8 -*-
 382   '''
 383   @author Sergey Chikuyonok (serge.che@gmail.com)
 384 --- 1,4 ----
 385 ! #!/usr/bin/env python2
 386   # -*- coding: utf-8 -*-
 387   '''
 388   @author Sergey Chikuyonok (serge.che@gmail.com)
 389 ***************
 390 *** 367,370 ****
 391                 pass
 392
 393   if user_settings:
 394 !       set_vocabulary(user_settings, VOC_USER)
 395 \ No newline at end of file
 396 --- 367,370 ----
 397                 pass
 398
 399   if user_settings:
 400 !       set_vocabulary(user_settings, VOC_USER)
 401 diff -rcB geany-zc-orig/zencoding/utils.py geany-zencoding/zencoding/utils.py
 402 *** geany-zc-orig/zencoding/utils.py    2011-11-14 20:59:28.753220920 +0545
 403 --- geany-zencoding/zencoding/utils.py  2011-11-14 20:58:34.886557511 +0545
 404 ***************
 405 *** 1,4 ****
 406 ! #!/usr/bin/env python
 407   # -*- coding: utf-8 -*-
 408   '''
 409   Core Zen Coding library. Contains various text manipulation functions:
 410 --- 1,4 ----
 411 ! #!/usr/bin/env python2
 412   # -*- coding: utf-8 -*-
 413   '''
 414   Core Zen Coding library. Contains various text manipulation functions: