Mercurial > kallithea

annotate rhodecode/lib/__init__.py @ 1420:a2fe0ac8d007 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated nginx proxy example to work better with large pushes
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 06 Jul 2011 14:43:54 +0200
parents b7563ad4e7ee
children ad5a543a9b2f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
914
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
1 # -*- coding: utf-8 -*-
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
2 """
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
3 rhodecode.lib.__init__
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
4 ~~~~~~~~~~~~~~~~~~~~~~~
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
5
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
6 Some simple helper functions
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1199
diff changeset
7
914
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
8 :created_on: Jan 5, 2011
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
9 :author: marcink
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1199
diff changeset
10 :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
914
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
11 :license: GPLv3, see COPYING for more details.
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
12 """
1206
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
13 # This program is free software: you can redistribute it and/or modify
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
14 # it under the terms of the GNU General Public License as published by
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
15 # the Free Software Foundation, either version 3 of the License, or
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
16 # (at your option) any later version.
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1199
diff changeset
17 #
914
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
18 # This program is distributed in the hope that it will be useful,
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
19 # but WITHOUT ANY WARRANTY; without even the implied warranty of
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
21 # GNU General Public License for more details.
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1199
diff changeset
22 #
914
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
23 # You should have received a copy of the GNU General Public License
1206
a671db5bdd58 fixed license issue #149
Marcin Kuzminski <marcin@python-works.com>
parents: 1203
diff changeset
24 # along with this program. If not, see <http://www.gnu.org/licenses/>.
914
110a00c181de Added force https option into config files
Marcin Kuzminski <marcin@python-works.com>
parents: 547
diff changeset
25
1223
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
26
1387
d9fa335650d3 moved json import into lib
Marcin Kuzminski <marcin@python-works.com>
parents: 1373
diff changeset
27 try:
d9fa335650d3 moved json import into lib
Marcin Kuzminski <marcin@python-works.com>
parents: 1373
diff changeset
28 import json
d9fa335650d3 moved json import into lib
Marcin Kuzminski <marcin@python-works.com>
parents: 1373
diff changeset
29 except ImportError:
d9fa335650d3 moved json import into lib
Marcin Kuzminski <marcin@python-works.com>
parents: 1373
diff changeset
30 #python 2.5 compatibility
d9fa335650d3 moved json import into lib
Marcin Kuzminski <marcin@python-works.com>
parents: 1373
diff changeset
31 import simplejson as json
d9fa335650d3 moved json import into lib
Marcin Kuzminski <marcin@python-works.com>
parents: 1373
diff changeset
32
d9fa335650d3 moved json import into lib
Marcin Kuzminski <marcin@python-works.com>
parents: 1373
diff changeset
33
1302
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
34 def __get_lem():
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
35 from pygments import lexers
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
36 from string import lower
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
37 from collections import defaultdict
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
38
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
39 d = defaultdict(lambda: [])
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
40
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
41 def __clean(s):
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
42 s = s.lstrip('*')
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
43 s = s.lstrip('.')
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
44
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
45 if s.find('[') != -1:
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
46 exts = []
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
47 start, stop = s.find('['), s.find(']')
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
48
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
49 for suffix in s[start + 1:stop]:
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
50 exts.append(s[:s.find('[')] + suffix)
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
51 return map(lower, exts)
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
52 else:
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
53 return map(lower, [s])
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
54
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
55 for lx, t in sorted(lexers.LEXERS.items()):
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
56 m = map(__clean, t[-2])
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
57 if m:
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
58 m = reduce(lambda x, y: x + y, m)
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
59 for ext in m:
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
60 desc = lx.replace('Lexer', '')
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
61 d[ext].append(desc)
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
62
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
63 return dict(d)
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
64
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
65 # language map is also used by whoosh indexer, which for those specified
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
66 # extensions will index it's content
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
67 LANGUAGES_EXTENSIONS_MAP = __get_lem()
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
68
1307
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
69 # Additional mappings that are not present in the pygments lexers
1302
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
70 # NOTE: that this will overide any mappings in LANGUAGES_EXTENSIONS_MAP
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
71 ADDITIONAL_MAPPINGS = {'xaml': 'XAML'}
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
72
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
73 LANGUAGES_EXTENSIONS_MAP.update(ADDITIONAL_MAPPINGS)
f0e904651f21 moved LANGUAGE_EXTENSION_MAP to lib, and made whoosh indexer use the same map
Marcin Kuzminski <marcin@python-works.com>
parents: 1300
diff changeset
74
1307
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
75
1223
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
76 def str2bool(_str):
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
77 """
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
78 returs True/False value from given string, it tries to translate the
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
79 string into boolean
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
80
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
81 :param _str: string value to translate into boolean
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
82 :rtype: boolean
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
83 :returns: boolean from given string
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
84 """
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
85 if _str is None:
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
86 return False
1223
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
87 if _str in (True, False):
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
88 return _str
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
89 _str = str(_str).strip().lower()
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
90 return _str in ('t', 'true', 'y', 'yes', 'on', '1')
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
91
1307
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
92
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
93 def convert_line_endings(line, mode):
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
94 """
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
95 Converts a given line "line end" accordingly to given mode
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
96
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
97 Available modes are::
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
98 0 - Unix
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
99 1 - Mac
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
100 2 - DOS
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
101
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
102 :param line: given line to convert
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
103 :param mode: mode to convert to
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
104 :rtype: str
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
105 :return: converted line according to mode
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
106 """
1305
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
107 from string import replace
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
108
1305
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
109 if mode == 0:
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
110 line = replace(line, '\r\n', '\n')
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
111 line = replace(line, '\r', '\n')
1305
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
112 elif mode == 1:
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
113 line = replace(line, '\r\n', '\r')
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
114 line = replace(line, '\n', '\r')
1305
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
115 elif mode == 2:
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
116 import re
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
117 line = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", line)
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
118 return line
1305
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
119
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
120
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
121 def detect_mode(line, default):
1307
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
122 """
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
123 Detects line break for given line, if line break couldn't be found
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
124 given default value is returned
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
125
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
126 :param line: str line
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
127 :param default: default
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
128 :rtype: int
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
129 :return: value of line end on of 0 - Unix, 1 - Mac, 2 - DOS
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
130 """
1305
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
131 if line.endswith('\r\n'):
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
132 return 2
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
133 elif line.endswith('\n'):
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
134 return 0
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
135 elif line.endswith('\r'):
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
136 return 1
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
137 else:
166317d464f3 Added server side file editing with commit
Marcin Kuzminski <marcin@python-works.com>
parents: 1302
diff changeset
138 return default
1116
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
139
1307
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
140
1116
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
141 def generate_api_key(username, salt=None):
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
142 """
1223
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
143 Generates unique API key for given username,if salt is not given
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
144 it'll be generated from some random string
1203
6832ef664673 source code cleanup: remove trailing white space, normalize file endings
Marcin Kuzminski <marcin@python-works.com>
parents: 1199
diff changeset
145
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
146 :param username: username as string
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
147 :param salt: salt to hash generate KEY
1223
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
148 :rtype: str
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
149 :returns: sha1 hash from username+salt
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
150 """
1116
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
151 from tempfile import _RandomNameSequence
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
152 import hashlib
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
153
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
154 if salt is None:
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
155 salt = _RandomNameSequence().next()
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
156
716911af91e1 Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents: 914
diff changeset
157 return hashlib.sha1(username + salt).hexdigest()
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
158
1223
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
159
1222
2c246d24eb90 simplified safe_unicode function
Marcin Kuzminski <marcin@python-works.com>
parents: 1206
diff changeset
160 def safe_unicode(_str, from_encoding='utf8'):
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
161 """
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
162 safe unicode function. In case of UnicodeDecode error we try to return
1401
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
163 unicode with errors replaceed
1223
f7b24987d5fb fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
Marcin Kuzminski <marcin@python-works.com>
parents: 1222
diff changeset
164
1222
2c246d24eb90 simplified safe_unicode function
Marcin Kuzminski <marcin@python-works.com>
parents: 1206
diff changeset
165 :param _str: string to decode
2c246d24eb90 simplified safe_unicode function
Marcin Kuzminski <marcin@python-works.com>
parents: 1206
diff changeset
166 :rtype: unicode
2c246d24eb90 simplified safe_unicode function
Marcin Kuzminski <marcin@python-works.com>
parents: 1206
diff changeset
167 :returns: unicode object
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
168 """
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
169
1199
268fa0b6b2ef Added os.sep in models for better win support
Marcin Kuzminski <marcin@python-works.com>
parents: 1154
diff changeset
170 if isinstance(_str, unicode):
268fa0b6b2ef Added os.sep in models for better win support
Marcin Kuzminski <marcin@python-works.com>
parents: 1154
diff changeset
171 return _str
268fa0b6b2ef Added os.sep in models for better win support
Marcin Kuzminski <marcin@python-works.com>
parents: 1154
diff changeset
172
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
173 try:
1222
2c246d24eb90 simplified safe_unicode function
Marcin Kuzminski <marcin@python-works.com>
parents: 1206
diff changeset
174 u_str = unicode(_str, from_encoding)
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
175 except UnicodeDecodeError:
1222
2c246d24eb90 simplified safe_unicode function
Marcin Kuzminski <marcin@python-works.com>
parents: 1206
diff changeset
176 u_str = unicode(_str, from_encoding, 'replace')
1154
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
177
36fe593dfe4b simplified str2bool, and moved safe_unicode out of helpers since it was not html specific function
Marcin Kuzminski <marcin@python-works.com>
parents: 1135
diff changeset
178 return u_str
1300
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
179
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
180
1401
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
181 def safe_str(_unicode, to_encoding='utf8'):
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
182 """
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
183 safe str function. In case of UnicodeEncode error we try to return
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
184 str with errors replaceed
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
185
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
186 :param _unicode: unicode to encode
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
187 :rtype: str
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
188 :returns: str object
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
189 """
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
190
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
191 if isinstance(_unicode, str):
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
192 return _unicode
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
193
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
194 try:
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
195 safe_str = str(_unicode)
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
196 except UnicodeEncodeError:
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
197 safe_str = _unicode.encode(to_encoding, 'replace')
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
198
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
199 return safe_str
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
200
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
201
b7563ad4e7ee Unicode fixes, added safe_str method for global str() operations +better test sandboxing
Marcin Kuzminski <marcin@python-works.com>
parents: 1387
diff changeset
202
1300
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
203 def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
204 """
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
205 Custom engine_from_config functions that makes sure we use NullPool for
1360
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
206 file based sqlite databases. This prevents errors on sqlite. This only
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
207 applies to sqlalchemy versions < 0.7.0
1307
c1516b35f91d pep8ify
Marcin Kuzminski <marcin@python-works.com>
parents: 1305
diff changeset
208
1300
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
209 """
1360
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
210 import sqlalchemy
1300
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
211 from sqlalchemy import engine_from_config as efc
1360
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
212 import logging
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
213
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
214 if int(sqlalchemy.__version__.split('.')[1]) < 7:
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
215
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
216 # This solution should work for sqlalchemy < 0.7.0, and should use
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
217 # proxy=TimerProxy() for execution time profiling
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
218
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
219 from sqlalchemy.pool import NullPool
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
220 url = configuration[prefix + 'url']
1300
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
221
1360
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
222 if url.startswith('sqlite'):
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
223 kwargs.update({'poolclass': NullPool})
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
224 return efc(configuration, prefix, **kwargs)
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
225 else:
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
226 import time
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
227 from sqlalchemy import event
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
228 from sqlalchemy.engine import Engine
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
229
1362
4c9bd42f82f9 timerproxy will use the same logger as sqlalchemy, in order to be controlled by sqlalchemy logger settings
Marcin Kuzminski <marcin@python-works.com>
parents: 1360
diff changeset
230 log = logging.getLogger('sqlalchemy.engine')
1360
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
231 BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38)
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
232 engine = efc(configuration, prefix, **kwargs)
1300
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
233
1360
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
234 def color_sql(sql):
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
235 COLOR_SEQ = "\033[1;%dm"
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
236 COLOR_SQL = YELLOW
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
237 normal = '\x1b[0m'
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
238 return ''.join([COLOR_SEQ % COLOR_SQL, sql, normal])
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
239
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
240 if configuration['debug']:
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
241 #attach events only for debug configuration
1300
882ac77dc709 fixed problem with `Cannot operate on a closed database` error, by forcing NullPool when using sqlite database.
Marcin Kuzminski <marcin@python-works.com>
parents: 1223
diff changeset
242
1360
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
243 def before_cursor_execute(conn, cursor, statement,
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
244 parameters, context, executemany):
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
245 context._query_start_time = time.time()
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
246 log.info(color_sql(">>>>> STARTING QUERY >>>>>"))
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
247
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
248
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
249 def after_cursor_execute(conn, cursor, statement,
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
250 parameters, context, executemany):
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
251 total = time.time() - context._query_start_time
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
252 log.info(color_sql("<<<<< TOTAL TIME: %f <<<<<" % total))
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
253
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
254 event.listen(engine, "before_cursor_execute",
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
255 before_cursor_execute)
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
256 event.listen(engine, "after_cursor_execute",
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
257 after_cursor_execute)
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
258
1f47adeb67c2 Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy.
Marcin Kuzminski <marcin@python-works.com>
parents: 1342
diff changeset
259 return engine
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
260
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
261
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
262 def age(curdate):
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
263 """
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
264 turns a datetime into an age string.
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
265
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
266 :param curdate: datetime object
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
267 :rtype: unicode
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
268 :returns: unicode words describing age
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
269 """
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
270
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
271 from datetime import datetime
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
272 from webhelpers.date import time_ago_in_words
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
273
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
274 _ = lambda s:s
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
275
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
276 if not curdate:
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
277 return ''
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
278
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
279 agescales = [(_(u"year"), 3600 * 24 * 365),
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
280 (_(u"month"), 3600 * 24 * 30),
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
281 (_(u"day"), 3600 * 24),
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
282 (_(u"hour"), 3600),
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
283 (_(u"minute"), 60),
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
284 (_(u"second"), 1), ]
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
285
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
286 age = datetime.now() - curdate
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
287 age_seconds = (age.days * agescales[2][1]) + age.seconds
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
288 pos = 1
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
289 for scale in agescales:
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
290 if scale[1] <= age_seconds:
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
291 if pos == 6:pos = 5
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
292 return '%s %s' % (time_ago_in_words(curdate,
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
293 agescales[pos][0]), _('ago'))
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
294 pos += 1
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
295
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
296 return _(u'just now')
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
297
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
298
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
299 def uri_filter(uri):
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
300 """
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
301 Removes user:password from given url string
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
302
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
303 :param uri:
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
304 :rtype: unicode
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
305 :returns: filtered list of strings
1342
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
306 """
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
307 if not uri:
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
308 return ''
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
309
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
310 proto = ''
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
311
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
312 for pat in ('https://', 'http://'):
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
313 if uri.startswith(pat):
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
314 uri = uri[len(pat):]
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
315 proto = pat
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
316 break
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
317
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
318 # remove passwords and username
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
319 uri = uri[uri.find('@') + 1:]
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
320
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
321 # get the port
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
322 cred_pos = uri.find(':')
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
323 if cred_pos == -1:
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
324 host, port = uri, None
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
325 else:
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
326 host, port = uri[:cred_pos], uri[cred_pos + 1:]
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
327
9dacacc5b7c2 When creating a remote repository, with credentials filled, it's good to hide username and password from the clone url. Only administrators can see this in repository settings page
Marcin Kuzminski <marcin@python-works.com>
parents: 1307
diff changeset
328 return filter(None, [proto, host, port])
1373
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
329
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
330
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
331 def credentials_filter(uri):
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
332 """
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
333 Returns a url with removed credentials
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
334
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
335 :param uri:
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
336 """
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
337
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
338 uri = uri_filter(uri)
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
339 #check if we have port
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
340 if len(uri) > 2 and uri[2]:
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
341 uri[2] = ':' + uri[2]
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
342
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
343 return ''.join(uri)
66f03a87141c Fixes issue #201
Marcin Kuzminski <marcin@python-works.com>
parents: 1362
diff changeset
344