← Back to branch summary

~ubuntu-branches/ubuntu/trusty/meld/trusty

« back to all changes in this revision

Viewing changes to meld/util/prefs.py

  • Committer: Package Import Robot
  • Author(s): Balint Reczey
  • Date: 2013-12-15 01:46:21 UTC
  • mfrom: (1.3.7)
  • Revision ID: package-import@ubuntu.com-20131215014621-k1fym2m1g7hqxacm
Tags: 1.8.3-1
* New upstream release:
  - Fix subdirectory comparisons for Subversion 1.6 (Ben Ross)
  - Fix git status parsing for some statuses (Tom Scytale)
  - Don't disable updating when syncpoints aren't yet active (Kai Willadsen)
  - Fix modifying column properties causing crashes when using .ini config
    backend (Kai Willadsen)

Show diffs side-by-side

added added

removed removed

Lines of Context:
meld/util/prefs.py
34
34
 
35
35
"""
36
36
 
 
37
import ast
37
38
import os
38
39
import sys
39
40
 
226
227
 
227
228
        for key, value in self._prefs.items():
228
229
            if self._parser.has_option("DEFAULT", key):
229
 
                value.current = self._type_mappings[value.type]("DEFAULT", key)
 
230
                val = self._type_mappings[value.type]("DEFAULT", key)
 
231
                if value.type == "list":
 
232
                    value.current = ast.literal_eval(val)
 
233
                else:
 
234
                    value.current = val
230
235
 
231
236
    def __getattr__(self, attr):
232
237
        return self._prefs[attr].current