Skip to content

Commit 2926133

Browse files
authored
Merge pull request #33 from jfsawin/master
Very minor fix: changes some methods to camelCase for style consistency
2 parents fddf2a2 + 5196869 commit 2926133

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

stringutilities.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,15 @@ def run(self, edit):
217217
for region in self.view.sel():
218218
if not region.empty():
219219
text = self.view.substr(region)
220-
self.view.replace(edit, region, self.hex_to_rgb(text))
220+
self.view.replace(edit, region, self.hexToRgb(text))
221221

222222
def enc(self):
223223
if self.view.encoding() == 'Undefined':
224224
return self.view.settings().get('default_encoding', 'UTF-8')
225225
else:
226226
return self.view.encoding()
227227

228-
def hex_to_rgb(self, value):
228+
def hexToRgb(self, value):
229229
value = value.lstrip('#')
230230
lv = len(value)
231231
if lv == 6:
@@ -248,15 +248,15 @@ def run(self, edit):
248248
reg_rgb = '^rgb[a]?\((\s*\d+\s*),(\s*\d+\s*),(\s*\d+\s*),?(\s*(0?.?\d)+\s*)?\)$'
249249
rgb_match = re.match(reg_rgb, text)
250250
if rgb_match is not None:
251-
self.view.replace(edit, region, self.rgb_to_hex(rgb_match))
251+
self.view.replace(edit, region, self.rgbToHex(rgb_match))
252252

253253
def enc(self):
254254
if self.view.encoding() == 'Undefined':
255255
return self.view.settings().get('default_encoding', 'UTF-8')
256256
else:
257257
return self.view.encoding()
258258

259-
def rgb_to_hex(self, rgb_match):
259+
def rgbToHex(self, rgb_match):
260260
"""Converts an rgb(a) value to a hex value.
261261
262262
Attributes:
@@ -347,22 +347,22 @@ def run(self, edit):
347347
text = self.view.substr(region)
348348

349349
if re.match('^([0-9]+)$', text):
350-
result = self.from_unix(text)
350+
result = self.fromUnix(text)
351351
else:
352-
result = self.to_unix(text)
352+
result = self.toUnix(text)
353353

354354
if result:
355355
self.view.replace(edit, region, result)
356356
else:
357357
sublime.status_message('Convert error.')
358358

359-
def from_unix(self, timestamp):
359+
def fromUnix(self, timestamp):
360360
sublime.status_message('Convert from epoch to human readable date.')
361361
timestamp = float(timestamp)
362362
stamp = datetime.fromtimestamp(timestamp)
363363
return stamp.strftime("%Y-%m-%d %H:%M")
364364

365-
def to_unix(self, timestr):
365+
def toUnix(self, timestr):
366366
sublime.status_message('Convert from human readable date to epoch.')
367367
try:
368368
datetime_to_convert = datetime.strptime(timestr, "%Y-%m-%d %H:%M")
@@ -453,7 +453,7 @@ def run(self, edit):
453453
self.view.replace(edit, region, output)
454454

455455

456-
#self.recursive_print(data)
456+
#self.recursivePrint(data)
457457

458458
#print(self.output)
459459

@@ -471,7 +471,7 @@ def enc(self):
471471
else:
472472
return self.view.encoding()
473473

474-
def recursive_print(self, src, dpth = 0, key = ''):
474+
def recursivePrint(self, src, dpth = 0, key = ''):
475475
""" Recursively prints nested elements."""
476476
tabs = lambda n: '\t' * n * 1 # or 2 or 8 or...
477477
brace = lambda s, n: '%s%s%s' % ('['*n, s, ']'*n)
@@ -480,11 +480,11 @@ def recursive_print(self, src, dpth = 0, key = ''):
480480
for key, value in src.items():
481481
if isinstance(value, dict) or (isinstance(value, list)):
482482
self.output += tabs(dpth) + brace(key, dpth) + "\n"
483-
self.recursive_print(value, dpth + 1, key)
483+
self.recursivePrint(value, dpth + 1, key)
484484
elif (isinstance(src, list)):
485485
self.i = 0
486486
for litem in src:
487-
self.recursive_print(litem, dpth + 1)
487+
self.recursivePrint(litem, dpth + 1)
488488
else:
489489
if key:
490490
self.output += tabs(dpth) + '[%s] => %s' % (key, src) + "\n"

0 commit comments

Comments
 (0)